diff --git a/ase/stx/memory.c b/ase/stx/memory.c index 1dc54168..1a75b634 100644 --- a/ase/stx/memory.c +++ b/ase/stx/memory.c @@ -1,16 +1,17 @@ /* - * $Id: memory.c,v 1.1 2005-05-06 15:54:47 bacon Exp $ + * $Id: memory.c,v 1.2 2005-05-06 16:07:58 bacon Exp $ */ #include #include +#include xp_stx_memory_t* xp_stx_memory_open ( xp_stx_memory_t* mem, xp_stx_word_t capacity) { - xp_assert (capacity > 0); xp_stx_object_t** slots; + xp_assert (capacity > 0); if (mem == XP_NULL) { mem = (xp_stx_memory_t*)xp_malloc(xp_sizeof(xp_stx_memory_t)); if (mem == XP_NULL) return XP_NULL; diff --git a/ase/stx/memory.h b/ase/stx/memory.h index 9988decd..25358461 100644 --- a/ase/stx/memory.h +++ b/ase/stx/memory.h @@ -1,5 +1,5 @@ /* - * $Id: memory.h,v 1.1 2005-05-06 15:54:47 bacon Exp $ + * $Id: memory.h,v 1.2 2005-05-06 16:07:58 bacon Exp $ */ #ifndef _XP_STX_MEMORY_H_ @@ -11,7 +11,7 @@ typedef struct xp_stx_memory_t xp_stx_memory_t; typedef struct xp_stx_object_t xp_stx_object_t; -typedef xp_byte xp_stx_byte_t; +typedef xp_byte_t xp_stx_byte_t; typedef xp_size_t xp_stx_word_t; typedef xp_size_t xp_stx_size_t; typedef xp_size_t xp_stx_index_t; @@ -40,6 +40,8 @@ struct xp_stx_memory_t //xp_stx_word_t smalltalk; //xp_stx_word_t classes[]; xp_stx_word_t symbol_table; + + xp_bool_t __malloced; }; #ifdef __cplusplus diff --git a/ase/stx/xpstx.tgt b/ase/stx/xpstx.tgt new file mode 100644 index 00000000..c9b8a9d8 --- /dev/null +++ b/ase/stx/xpstx.tgt @@ -0,0 +1,157 @@ +40 +targetIdent +0 +MProject +1 +MComponent +0 +2 +WString +3 +LIB +3 +WString +5 +n_2sn +1 +0 +1 +4 +MCommand +0 +5 +MCommand +0 +6 +MItem +9 +xpstx.lib +7 +WString +3 +LIB +8 +WVList +0 +9 +WVList +0 +-1 +1 +1 +0 +10 +WPickList +4 +11 +MItem +3 +*.c +12 +WString +4 +COBJ +13 +WVList +3 +14 +MVState +15 +WString +3 +WCC +16 +WString +25 +n????Include directories: +1 +17 +WString +34 +$(%watcom)\h;$(%watcom)\h\nt;..\.. +0 +18 +MRState +19 +WString +3 +WCC +20 +WString +35 +??2??Pentium Register based calling +1 +0 +21 +MRState +22 +WString +3 +WCC +23 +WString +32 +??2??Pentium Stack based calling +1 +1 +24 +WVList +0 +-1 +1 +1 +0 +25 +MItem +8 +memory.c +26 +WString +4 +COBJ +27 +WVList +0 +28 +WVList +0 +11 +1 +1 +0 +29 +MItem +3 +*.h +30 +WString +3 +NIL +31 +WVList +0 +32 +WVList +0 +-1 +1 +1 +0 +33 +MItem +8 +memory.h +34 +WString +3 +NIL +35 +WVList +0 +36 +WVList +0 +29 +1 +1 +0 diff --git a/ase/stx/xpstx.wpj b/ase/stx/xpstx.wpj new file mode 100644 index 00000000..f7bb4c64 --- /dev/null +++ b/ase/stx/xpstx.wpj @@ -0,0 +1,43 @@ +40 +projectIdent +0 +VpeMain +1 +WRect +4300 +333 +4330 +9200 +2 +MProject +3 +MCommand +0 +4 +MCommand +0 +1 +5 +WFileName +9 +xpstx.tgt +6 +WVList +1 +7 +VComponent +8 +WRect +0 +0 +3690 +4280 +0 +0 +9 +WFileName +9 +xpstx.tgt +0 +0 +7