Unified · Split
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | #define MACRO_STACK_SIZE 32 | 27 | #define MACRO_STACK_SIZE 32 |
| 28 | #define INCLUDE_STACK_SIZE 32 | 28 | #define INCLUDE_STACK_SIZE 32 |
| 29 | #define IFDEF_STACK_SIZE 64 | 29 | #define IFDEF_STACK_SIZE 64 |
| 30 | #define VSTACK_SIZE 64 | ||
| 30 | 31 | ||
| 31 | #define NB_REGS 3 | 32 | #define NB_REGS 3 |
| 32 | 33 | ||
| @@ -61,11 +62,11 @@ typedef struct { · 28 unmodified lines | |||
| 61 | */ | 62 | */ |
| 62 | FILE *file; | 63 | FILE *file; |
| 63 | int tok, tok1, tokc, rsym, anon_sym, | 64 | int tok, tok1, tokc, rsym, anon_sym, |
| 64 | prog, ind, loc, glo, vt, *vstack, *vstack_ptr, | 65 | prog, ind, loc, glo, vt, vc, line_num; |
| 65 | vc, line_num; | ||
| 66 | char *idtable, *idptr, *filename; | 66 | char *idtable, *idptr, *filename; |
| 67 | Sym *define_stack, *global_stack, *local_stack, *label_stack; | 67 | Sym *define_stack, *global_stack, *local_stack, *label_stack; |
| 68 | 68 | ||
| 69 | int vstack[VSTACK_SIZE], *vstack_ptr; | ||
| 69 | char *macro_stack[MACRO_STACK_SIZE], **macro_stack_ptr, *macro_ptr; | 70 | char *macro_stack[MACRO_STACK_SIZE], **macro_stack_ptr, *macro_ptr; |
| 70 | IncludeFile include_stack[INCLUDE_STACK_SIZE], *include_stack_ptr; | 71 | IncludeFile include_stack[INCLUDE_STACK_SIZE], *include_stack_ptr; |
| 71 | int ifdef_stack[IFDEF_STACK_SIZE], *ifdef_stack_ptr; | 72 | int ifdef_stack[IFDEF_STACK_SIZE], *ifdef_stack_ptr; |
| @@ -541,7 +542,7 @@ void preprocess() · 469 unmodified lines | |||
| 541 | /* now 'tok' is the macro symbol */ | 542 | /* now 'tok' is the macro symbol */ |
| 542 | /* a space is inserted after each macro */ | 543 | /* a space is inserted after each macro */ |
| 543 | str = get_str(' '); | 544 | str = get_str(' '); |
| 544 | printf("define %s '%s'\n", get_tok_str(tok), str); | 545 | // printf("define %s '%s'\n", get_tok_str(tok), str); |
| 545 | sym_push1(&define_stack, tok, 0, (int)str); | 546 | sym_push1(&define_stack, tok, 0, (int)str); |
| 546 | } else if (tok == TOK_INCLUDE) { | 547 | } else if (tok == TOK_INCLUDE) { |
| 547 | skip_spaces(); | 548 | skip_spaces(); |
| @@ -1105,6 +1106,8 @@ int gvp(int *p) · 557 unmodified lines | |||
| 1105 | 1106 | ||
| 1106 | void vpush() | 1107 | void vpush() |
| 1107 | { | 1108 | { |
| 1109 | if (vstack_ptr >= vstack + VSTACK_SIZE) | ||
| 1110 | error("memory full"); | ||
| 1108 | *vstack_ptr++ = vt; | 1111 | *vstack_ptr++ = vt; |
| 1109 | *vstack_ptr++ = vc; | 1112 | *vstack_ptr++ = vc; |
| 1110 | /* cannot let cpu flags if other instruction are generated */ | 1113 | /* cannot let cpu flags if other instruction are generated */ |
| @@ -2330,7 +2333,6 @@ int main(int c, char **v) · 1219 unmodified lines | |||
| 2330 | glo = malloc(DATA_SIZE); | 2333 | glo = malloc(DATA_SIZE); |
| 2331 | memset((void *)glo, 0, DATA_SIZE); | 2334 | memset((void *)glo, 0, DATA_SIZE); |
| 2332 | prog = malloc(TEXT_SIZE); | 2335 | prog = malloc(TEXT_SIZE); |
| 2333 | vstack = malloc(256); | ||
| 2334 | vstack_ptr = vstack; | 2336 | vstack_ptr = vstack; |
| 2335 | macro_stack_ptr = macro_stack; | 2337 | macro_stack_ptr = macro_stack; |
| 2336 | anon_sym = 1 << (31 - VT_STRUCT_SHIFT); | 2338 | anon_sym = 1 << (31 - VT_STRUCT_SHIFT); |