From: Robert Pengelly Date: Sun, 16 Mar 2025 12:11:59 +0000 (+0000) Subject: Added Makefile.wat X-Git-Url: https://git.candlhat.org/?a=commitdiff_plain;ds=sidebyside;p=sasm.git Added Makefile.wat --- diff --git a/Makefile.unix b/Makefile.unix index 35cd617..b859deb 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -22,5 +22,6 @@ sasm: $(CSRC) endif clean: + if [ -f sasm ]; then rm -rf sasm; fi if [ -f sasm.exe ]; then rm -rf sasm.exe; fi diff --git a/Makefile.w32 b/Makefile.w32 index 533c7f0..41bb95f 100644 --- a/Makefile.w32 +++ b/Makefile.w32 @@ -12,8 +12,10 @@ CSRC := as.c bin.c cstr.c elks.c eval.c expr.c fixup.c frag.c ha all: sasm.exe clean: + if exist sasm ( del /q sasm ) if exist sasm.exe ( del /q sasm.exe ) sasm.exe: $(CSRC) + $(CC) $(CFLAGS) -o $@ $^ diff --git a/Makefile.wat b/Makefile.wat new file mode 100644 index 0000000..4abd488 --- /dev/null +++ b/Makefile.wat @@ -0,0 +1,18 @@ +#****************************************************************************** +# @file Makefile.w32 +#****************************************************************************** +SRCDIR ?= $(CURDIR) +VPATH := $(SRCDIR) + +SRC := as.c bin.c cstr.c elks.c eval.c expr.c fixup.c frag.c hashtab.c intel.c kwd.c lex.c lib.c list.c listing.c ll.c macro.c process.c report.c section.c symbol.c vector.c + +all: sasm.exe + +sasm.exe: $(SRC) + + wcl -fe=$@ $^ + +clean: + + for /r %%f in (*.obj) do ( if exist %%f ( del /q %%f ) ) + if exist sasm.exe ( del /q sasm.exe ) diff --git a/hashtab.c b/hashtab.c index 9ddaf7e..328b622 100644 --- a/hashtab.c +++ b/hashtab.c @@ -103,7 +103,7 @@ static unsigned int hash_string (const void *p, unsigned int length) { unsigned int result = 0; for (i = 0; i < length; i++) { - result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 24); + result = (((unsigned short) str[i]) << 4) + (result >> 9) + result + (result >> 3) + (((unsigned short) str[i]) << 2) - (result << 12); } return result; @@ -112,8 +112,8 @@ static unsigned int hash_string (const void *p, unsigned int length) { struct hashtab_name *hashtab_alloc_name (const char *str) { - struct hashtab_name *name; unsigned int bytes = strlen (str), hash = hash_string (str, bytes); + struct hashtab_name *name; if ((name = malloc (sizeof (*name))) == NULL) { return NULL; diff --git a/hashtab.h b/hashtab.h index 47aab3b..ed8e828 100644 --- a/hashtab.h +++ b/hashtab.h @@ -7,7 +7,7 @@ struct hashtab_name { const char *chars; - int bytes, hash; + unsigned int bytes, hash; }; diff --git a/intel.c b/intel.c index 26269d0..f9e63e0 100644 --- a/intel.c +++ b/intel.c @@ -890,7 +890,7 @@ struct instruction { struct sib_byte sib; struct reg_entry *base_reg, *index_reg; - unsigned int types[MAX_OPERANDS]; + unsigned long types[MAX_OPERANDS]; struct expr *imms[MAX_OPERANDS]; struct expr *disps[MAX_OPERANDS]; @@ -3065,7 +3065,9 @@ static void optimize_size_of_imms (void) { static int match_template (void) { - unsigned int found_reverse_match = 0, suffix_check = 0; + unsigned long suffix_check = 0; + unsigned int found_reverse_match = 0; + struct template *template; switch (instruction.suffix) { diff --git a/intel.h b/intel.h index 98711c8..690c0ee 100644 --- a/intel.h +++ b/intel.h @@ -118,7 +118,9 @@ struct template { struct reg_entry { const char *name; - unsigned int type, number; + + unsigned long type; + unsigned int number; }; diff --git a/process.c b/process.c index ec1239b..8264d8c 100644 --- a/process.c +++ b/process.c @@ -356,9 +356,6 @@ static void handler_include (char *start, char **pp) { char *inc_path, *tmp; FILE *fp; - struct hashtab_name *key; - struct macro *m; - if (**pp != '"' && **pp != '<') { report_line_at (orig_fn, orig_ln, REPORT_ERROR, start, *pp, "%%include expects \"FILENAME\" or "); @@ -428,33 +425,6 @@ static void handler_include (char *start, char **pp) { end: set_filename_and_line_number (orig_fn, orig_ln); - - if ((key = find_macro ("__FILE__"))) { - - if ((m = get_macro (key)) && m->type == MACRO_BUILTIN) { - - free (m->value); - - m->value = xmalloc (1 + strlen (orig_fn) + 2); - sprintf (m->value, "\"%s\"", orig_fn); - - } - - } - - if ((key = find_macro ("__LINE__"))) { - - if ((m = get_macro (key)) && m->type == MACRO_BUILTIN) { - - free (m->value); - - m->value = xmalloc (23); - sprintf (m->value, "%lu", orig_ln); - - } - - } - free (sname); } @@ -539,33 +509,11 @@ struct pp_pseudo_op_entry *find_directive (char *name) { static void init_builtin_macros (void) { - static char *builtins[] = { "__FILE__", "__LINE__" }; char *name; struct hashtab_name *key; struct macro *m; - unsigned long cnt = (sizeof (builtins) / sizeof (*builtins)); - unsigned i; - - for (i = 0; i < cnt; i++) { - - name = xstrdup (builtins[i]); - - if ((key = hashtab_alloc_name (name))) { - - m = xmalloc (sizeof (*m)); - m->type = MACRO_BUILTIN; - - m->name = name; - m->value = xstrdup (""); - - push_macro (key, m); - - } - - } - name = xstrdup ("__SASM__"); if ((key = hashtab_alloc_name (name))) { @@ -582,59 +530,6 @@ static void init_builtin_macros (void) { } -static void init_date_time_macros (void) { - - char *timep, *buf, *name, temp[3] = { 0 }; - time_t now; - - struct hashtab_name *key; - struct macro *m; - - time (&now); - timep = ctime (&now); - - name = xstrdup ("__TIME__"); - - if ((key = hashtab_alloc_name (name))) { - - buf = xmalloc (11); - sprintf (buf, "\"%.8s\"", timep + 11);; - - m = xmalloc (sizeof (*m)); - m->type = MACRO_BUILTIN; - - m->name = name; - m->value = buf; - - push_macro (key, m); - - } - - name = xstrdup ("__DATE__"); - - if ((key = hashtab_alloc_name (name))) { - - sprintf (temp, "%.2s", timep + 8); - buf = xmalloc (14); - - if (atoi (temp) < 10) { - sprintf (buf, "\"%.3s %.1s %.4s\"", timep + 4, timep + 9, timep + 20); - } else { - sprintf (buf, "\"%.3s %.2s %.4s\"", timep + 4, timep + 8, timep + 20); - } - - m = xmalloc (sizeof (*m)); - m->type = MACRO_BUILTIN; - - m->name = name; - m->value = buf; - - push_macro (key, m); - - } - -} - int preprocess_init (void) { struct list *item; @@ -650,7 +545,6 @@ int preprocess_init (void) { } init_builtin_macros (); - init_date_time_macros (); if (state->pplist) { @@ -1332,9 +1226,6 @@ void process_file (const char *ifile) { struct cond *cond; int cond_idx, proc_idx, seg_idx; - struct hashtab_name *key; - struct macro *m; - if (!ifile || strcmp (ifile, "-") == 0) { set_filename (xstrdup ("")); @@ -1356,21 +1247,6 @@ void process_file (const char *ifile) { set_line_number (0); new_line_number = 1; - if ((key = find_macro ("__FILE__"))) { - - const char *filename = get_filename ();; - - if (filename && (m = get_macro (key)) && m->type == MACRO_BUILTIN) { - - free (m->value); - - m->value = xmalloc (1 + strlen (filename) + 2); - sprintf (m->value, "\"%s\"", filename); - - } - - } - load_line_internal_data = load_line_create_internal_data (&new_line_number); while (!load_line (&line, &line_end, &real_line, &real_line_len, &newlines, fp, &load_line_internal_data)) { @@ -1385,19 +1261,6 @@ void process_file (const char *ifile) { } - if ((key = find_macro ("__LINE__"))) { - - if ((m = get_macro (key)) && m->type == MACRO_BUILTIN) { - - free (m->value); - - m->value = xmalloc (23); - sprintf (m->value, "%lu", get_line_number ()); - - } - - } - start = line; caret = (line = skip_whitespace (line));