annotate lwasm/lwasm.c @ 370:6b33faa21a0a

Debugging output and bugfixing pass 0
author lost@starbug
date Tue, 20 Apr 2010 21:59:58 -0600
parents d96c30e60ddf
children 9c24d9d485b9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
1 /*
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
2 lwasm.c
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
3
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
4 Copyright © 2010 William Astle
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
5
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
6 This file is part of LWTOOLS.
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
7
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
8 LWTOOLS is free software: you can redistribute it and/or modify it under the
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
9 terms of the GNU General Public License as published by the Free Software
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
10 Foundation, either version 3 of the License, or (at your option) any later
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
11 version.
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
12
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
13 This program is distributed in the hope that it will be useful, but WITHOUT
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
16 more details.
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
17
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
18 You should have received a copy of the GNU General Public License along with
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
19 this program. If not, see <http://www.gnu.org/licenses/>.
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
20 */
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
21
344
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
22 #define ___lwasm_c_seen___
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
23
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
24 #include <config.h>
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
25
344
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
26 #include <stdio.h>
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
27 #include <stdarg.h>
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
28 #include <string.h>
344
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
29
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
30 #include <lw_expr.h>
344
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
31 #include <lw_alloc.h>
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
32 #include <lw_string.h>
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
33
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
34 #include "lwasm.h"
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
35
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
36 void lwasm_register_error(asmstate_t *as, line_t *l, const char *msg, ...);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
37
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
38 lw_expr_t lwasm_evaluate_var(char *var, void *priv)
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
39 {
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
40 asmstate_t *as = (asmstate_t *)priv;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
41 lw_expr_t e;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
42 importlist_t *im;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
43 struct symtabe *s;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
44
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
45 s = lookup_symbol(as, as -> cl, var);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
46 if (s)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
47 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
48 e = lw_expr_build(lw_expr_type_special, lwasm_expr_syment, s);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
49 return e;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
50 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
51
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
52 // undefined here is undefied unless output is object
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
53 if (as -> output_format != OUTPUT_OBJ)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
54 goto nomatch;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
55
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
56 // check for import
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
57 for (im = as -> importlist; im; im = im -> next)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
58 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
59 if (!strcmp(im -> symbol, var))
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
60 break;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
61 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
62
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
63 // check for "undefined" to import automatically
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
64 if (!im && CURPRAGMA(as -> cl, PRAGMA_UNDEFEXTERN))
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
65 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
66 im = lw_alloc(sizeof(importlist_t));
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
67 im -> symbol = lw_strdup(var);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
68 im -> next = as -> importlist;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
69 as -> importlist = im;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
70 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
71
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
72 if (!im)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
73 goto nomatch;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
74
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
75 e = lw_expr_build(lw_expr_type_special, lwasm_expr_import, im);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
76 return e;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
77
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
78 nomatch:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
79 if (as -> badsymerr)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
80 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
81 lwasm_register_error(as, as -> cl, "Undefined symbol %s", var);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
82 }
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
83 return NULL;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
84 }
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
85
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
86 lw_expr_t lwasm_evaluate_special(int t, void *ptr, void *priv)
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
87 {
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
88 switch (t)
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
89 {
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
90 case lwasm_expr_linelen:
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
91 {
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
92 line_t *cl = ptr;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
93 if (cl -> len == -1)
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
94 return NULL;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
95 return lw_expr_build(lw_expr_type_int, cl -> len);
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
96 }
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
97 break;
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
98
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
99 case lwasm_expr_lineaddr:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
100 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
101 line_t *cl = ptr;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
102 if (cl -> addr)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
103 return lw_expr_copy(cl -> addr);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
104 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
105 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
106 }
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
107
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
108 case lwasm_expr_syment:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
109 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
110 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
111 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
112
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
113 case lwasm_expr_import:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
114 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
115 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
116 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
117
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
118 case lwasm_expr_nextbp:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
119 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
120 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
121 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
122
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
123 case lwasm_expr_prevbp:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
124 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
125 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
126 }
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
127 }
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
128 return NULL;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
129 }
344
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
130
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
131 void lwasm_register_error(asmstate_t *as, line_t *l, const char *msg, ...)
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
132 {
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
133 lwasm_error_t *e;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
134 va_list args;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
135 char errbuff[1024];
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
136 int r;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
137
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
138 if (!l)
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
139 return;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
140
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
141 va_start(args, msg);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
142
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
143 e = lw_alloc(sizeof(lwasm_error_t));
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
144
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
145 e -> next = l -> err;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
146 l -> err = e;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
147
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
148 as -> errorcount++;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
149
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
150 r = vsnprintf(errbuff, 1024, msg, args);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
151 e -> mess = lw_strdup(errbuff);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
152
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
153 va_end(args);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
154 }
345
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
155
351
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
156 void lwasm_register_warning(asmstate_t *as, line_t *l, const char *msg, ...)
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
157 {
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
158 lwasm_error_t *e;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
159 va_list args;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
160 char errbuff[1024];
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
161 int r;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
162
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
163 if (!l)
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
164 return;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
165
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
166 va_start(args, msg);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
167
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
168 e = lw_alloc(sizeof(lwasm_error_t));
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
169
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
170 e -> next = l -> err;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
171 l -> err = e;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
172
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
173 as -> errorcount++;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
174
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
175 r = vsnprintf(errbuff, 1024, msg, args);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
176 e -> mess = lw_strdup(errbuff);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
177
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
178 va_end(args);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
179 }
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
180
345
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
181 int lwasm_next_context(asmstate_t *as)
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
182 {
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
183 int r;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
184 r = as -> nextcontext;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
185 as -> nextcontext++;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
186 return r;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
187 }
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
188
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
189 void lwasm_emit(line_t *cl, int byte)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
190 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
191 if (cl -> outputl == cl -> outputbl)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
192 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
193 cl -> output = lw_realloc(cl -> output, cl -> outputbl + 8);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
194 cl -> outputbl += 8;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
195 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
196 cl -> output[cl -> outputl++] = byte & 0xff;
354
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
197
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
198 if (cl -> inmod)
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
199 {
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
200 asmstate_t *as = cl -> as;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
201 // update module CRC
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
202 // this is a direct transliteration from the nitros9 asm source
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
203 // to C; it can, no doubt, be optimized for 32 bit processing
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
204 byte &= 0xff;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
205
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
206 byte ^= (as -> crc)[0];
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
207 (as -> crc)[0] = (as -> crc)[1];
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
208 (as -> crc)[1] = (as -> crc)[2];
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
209 (as -> crc)[1] ^= (byte >> 7);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
210 (as -> crc)[2] = (byte << 1);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
211 (as -> crc)[1] ^= (byte >> 2);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
212 (as -> crc)[2] ^= (byte << 6);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
213 byte ^= (byte << 1);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
214 byte ^= (byte << 2);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
215 byte ^= (byte << 4);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
216 if (byte & 0x80)
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
217 {
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
218 (as -> crc)[0] ^= 0x80;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
219 (as -> crc)[2] ^= 0x21;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
220 }
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
221 }
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
222 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
223
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
224 void lwasm_emitop(line_t *cl, int opc)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
225 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
226 if (opc > 0x100)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
227 lwasm_emit(cl, opc >> 8);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
228 lwasm_emit(cl, opc);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
229 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
230
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
231 lw_expr_t lwasm_parse_term(char **p, void *priv)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
232 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
233 asmstate_t *as = priv;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
234 int val;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
235
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
236 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
237 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
238
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
239 if (**p == '*' || (
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
240 **p == '.'
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
241 && !((*p)[1] >= 'A' && (*p)[1] <= 'Z')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
242 && !((*p)[1] >= 'a' && (*p)[1] <= 'z')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
243 && !((*p)[1] >= '0' && (*p)[1] <= '9')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
244 ))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
245 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
246 // special "symbol" for current line addr (*, .)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
247 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
248 return lw_expr_build(lw_expr_type_special, lwasm_expr_lineaddr, as -> cl);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
249 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
250
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
251 // branch points
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
252 if (**p == '<')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
253 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
254 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
255 return lw_expr_build(lw_expr_type_special, lwasm_expr_prevbp, as -> cl);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
256 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
257 if (**p == '>')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
258 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
259 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
260 return lw_expr_build(lw_expr_type_special, lwasm_expr_nextbp, as -> cl);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
261 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
262
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
263 // double ascii constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
264 if (**p == '"')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
265 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
266 int v;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
267 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
268 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
269 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
270 if (!*((*p)+1))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
271 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
272 v = (unsigned char)**p << 8 | (unsigned char)*((*p)+1);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
273 (*p) += 2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
274 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
275 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
276
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
277 if (**p == '\'')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
278 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
279 int v;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
280
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
281 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
282 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
283 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
284
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
285 v = (unsigned char)**p;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
286 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
287 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
288 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
289
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
290 if (**p == '&')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
291 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
292 // decimal constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
293 int v = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
294 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
295
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
296 if (!strchr("0123456789", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
297 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
298
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
299 while (**p && strchr("0123456789", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
300 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
301 val = val * 10 + (**p - '0');
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
302 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
303 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
304 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
305 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
306
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
307 if (**p == '%')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
308 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
309 // binary constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
310 int v = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
311 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
312
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
313 if (**p != '0' && **p != '1')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
314 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
315
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
316 while (**p && (**p == '0' || **p == '1'))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
317 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
318 val = val * 2 + (**p - '0');
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
319 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
320 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
321 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
322 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
323
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
324 if (**p == '$')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
325 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
326 // hexadecimal constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
327 int v = 0, v2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
328 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
329
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
330 if (!strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
331 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
332
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
333 while (**p && strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
334 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
335 v2 = toupper(**p) - '0';
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
336 if (v2 > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
337 v2 -= 7;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
338 val = val * 16 + v2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
339 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
340 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
341 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
342 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
343
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
344 if (**p == '0' && (*((*p)+1) == 'x' || *((*p)+1) == 'X'))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
345 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
346 // hexadecimal constant, C style
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
347 int v = 0, v2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
348 (*p)+=2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
349
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
350 if (!strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
351 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
352
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
353 while (**p && strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
354 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
355 v2 = toupper(**p) - '0';
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
356 if (v2 > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
357 v2 -= 7;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
358 val = val * 16 + v2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
359 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
360 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
361 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
362 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
363
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
364 if (**p == '@' && (*((*p)+1) >= '0' && *((*p)+1) <= '7'))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
365 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
366 // octal constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
367 int v = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
368 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
369
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
370 if (!strchr("01234567", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
371 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
372
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
373 while (**p && strchr("01234567", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
374 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
375 val = val * 8 + (**p - '0');
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
376 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
377 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
378 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
379 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
380
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
381
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
382 // symbol or bare decimal or suffix constant here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
383 do
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
384 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
385 int havedol = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
386 int l = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
387
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
388 while ((*p)[l] && strchr(SYMCHARS, (*p)[l]))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
389 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
390 if ((*p)[l] == '$')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
391 havedol = 1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
392 l++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
393 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
394 if (l == 0)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
395 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
396
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
397 if (havedol || **p < '0' || **p > '9')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
398 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
399 // have a symbol here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
400 char *sym;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
401 lw_expr_t term;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
402
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
403 sym = lw_strndup(*p, l);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
404 (*p) += l;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
405 term = lw_expr_build(lw_expr_type_var, sym);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
406 lw_free(sym);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
407 return term;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
408 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
409 } while (0);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
410
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
411 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
412 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
413
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
414 // we have a numeric constant here, either decimal or postfix base notation
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
415 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
416 int decval = 0, binval = 0, hexval = 0, octval = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
417 int valtype = 15; // 1 = bin, 2 = oct, 4 = dec, 8 = hex
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
418 int bindone = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
419 int val;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
420 int dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
421
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
422 while (1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
423 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
424 if (!**p || !strchr("0123456789ABCDEFabcdefqhoQHO", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
425 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
426 // we can legally be bin or decimal here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
427 if (bindone)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
428 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
429 // just finished a binary value
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
430 val = binval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
431 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
432 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
433 else if (valtype & 4)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
434 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
435 val = decval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
436 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
437 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
438 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
439 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
440 // bad value
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
441 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
442 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
443 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
444
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
445 dval = toupper(**p);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
446 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
447
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
448 if (bindone)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
449 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
450 // any characters past "B" means it is not binary
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
451 bindone = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
452 valtype &= 14;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
453 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
454
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
455 switch (dval)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
456 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
457 case 'Q':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
458 case 'O':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
459 if (valtype & 2)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
460 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
461 val = octval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
462 valtype = -1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
463 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
464 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
465 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
466 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
467 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
468 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
469 /* can't get here */
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
470
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
471 case 'H':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
472 if (valtype & 8)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
473 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
474 val = hexval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
475 valtype = -1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
476 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
477 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
478 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
479 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
480 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
481 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
482 /* can't get here */
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
483
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
484 case 'B':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
485 // this is a bit of a sticky one since B may be a
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
486 // hex number instead of the end of a binary number
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
487 // so it falls through to the digit case
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
488 if (valtype & 1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
489 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
490 // could still be binary of hex
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
491 bindone = 1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
492 valtype = 9;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
493 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
494 /* fall through intented */
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
495
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
496 default:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
497 // digit
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
498 dval -= '0';
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
499 if (dval > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
500 dval -= 7;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
501 if (valtype & 8)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
502 hexval = hexval * 16 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
503 if (valtype & 4)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
504 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
505 if (dval > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
506 valtype &= 11;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
507 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
508 decval = decval * 10 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
509 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
510 if (valtype & 2)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
511 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
512 if (dval > 7)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
513 valtype &= 13;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
514 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
515 octval = octval * 8 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
516 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
517 if (valtype & 1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
518 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
519 if (dval > 1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
520 valtype &= 14;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
521 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
522 binval = binval * 2 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
523 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
524 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
525 if (valtype == -1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
526 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
527
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
528 // return if no more valid types
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
529 if (valtype == 0)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
530 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
531
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
532 val = decval; // in case we fall through
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
533 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
534
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
535 // get here if we have a value
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
536 return lw_expr_build(lw_expr_type_int, val);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
537 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
538 // can't get here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
539 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
540
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
541 lw_expr_t lwasm_parse_expr(asmstate_t *as, char **p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
542 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
543 lw_expr_t e;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
544
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
545 e = lw_expr_parse(p, as);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
546
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
547 return e;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
548 }
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
549
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
550 int lwasm_reduce_expr(asmstate_t *as, lw_expr_t expr)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
551 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
552 lw_expr_simplify(expr, as);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
553 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
554
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
555 void lwasm_save_expr(line_t *cl, int id, lw_expr_t expr)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
556 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
557 struct line_expr_s *e;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
558
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
559 for (e = cl -> exprs; e; e = e -> next)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
560 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
561 if (e -> id == id)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
562 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
563 lw_expr_destroy(e -> expr);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
564 e -> expr = expr;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
565 return;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
566 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
567 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
568
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
569 e = lw_alloc(sizeof(struct line_expr_s));
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
570 e -> expr = expr;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
571 e -> id = id;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
572 e -> next = cl -> exprs;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
573 cl -> exprs = e;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
574 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
575
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
576 lw_expr_t lwasm_fetch_expr(line_t *cl, int id)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
577 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
578 struct line_expr_s *e;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
579
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
580 for (e = cl -> exprs; e; e = e -> next)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
581 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
582 if (e -> id == id)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
583 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
584 return e -> expr;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
585 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
586 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
587 return NULL;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
588 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
589
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
590 void skip_operand(char **p)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
591 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
592 for (; **p && !isspace(**p); (*p)++)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
593 /* do nothing */ ;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
594 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
595
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
596 int lwasm_emitexpr(line_t *l, lw_expr_t expr, int size)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
597 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
598 int v;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
599
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
600 if (lw_expr_istype(expr, lw_expr_type_int))
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
601 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
602 v = lw_expr_intval(expr);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
603 }
348
11a95c6414b4 Added third func to instab to split resolve and emit logic
lost@starbug
parents: 347
diff changeset
604 // handle external/cross-section/incomplete references here
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
605 else
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
606 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
607 lwasm_register_error(l -> as, l, "Expression not fully resolved");
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
608 return -1;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
609 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
610
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
611 switch (size)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
612 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
613 case 4:
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
614 lwasm_emit(l, v >> 24);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
615 lwasm_emit(l, v >> 16);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
616 /* fallthrough intended */
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
617
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
618 case 2:
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
619 lwasm_emit(l, v >> 8);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
620 /* fallthrough intended */
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
621
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
622 case 1:
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
623 lwasm_emit(l, v);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
624 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
625
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
626 return 0;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
627 }
357
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
628
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
629 int lwasm_lookupreg2(const char *regs, char **p)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
630 {
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
631 int rval = 0;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
632
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
633 while (*regs)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
634 {
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
635 if (toupper(**p) == *regs)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
636 {
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
637 if (regs[1] == ' ' && !isalpha(*(*p + 1)))
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
638 break;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
639 if (toupper(*(*p + 1)) == regs[1])
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
640 break;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
641 }
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
642 regs += 2;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
643 rval++;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
644 }
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
645 if (!*regs)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
646 return -1;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
647 if (regs[1] == ' ')
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
648 (*p)++;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
649 else
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
650 (*p) += 2;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
651 return rval;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
652 }
359
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
653
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
654 int lwasm_lookupreg3(const char *regs, char **p)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
655 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
656 int rval = 0;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
657
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
658 while (*regs)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
659 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
660 if (toupper(**p) == *regs)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
661 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
662 if (regs[1] == ' ' && !isalpha(*(*p + 1)))
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
663 break;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
664 if (toupper(*(*p + 1)) == regs[1])
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
665 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
666 if (regs[2] == ' ' && !isalpha(*(*p + 2)))
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
667 break;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
668 if (toupper(*(*p + 2)) == regs[2])
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
669 break;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
670 }
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
671 }
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
672 regs += 3;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
673 rval++;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
674 }
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
675 if (!*regs)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
676 return -1;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
677 if (regs[1] == ' ')
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
678 (*p)++;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
679 else if (regs[2] == ' ')
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
680 (*p) += 2;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
681 else
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
682 (*p) += 3;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
683 return rval;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
684 }
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
685
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
686 void lwasm_show_errors(asmstate_t *as)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
687 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
688 fprintf(stderr, "Errors encountered. FIXME - print out errors.\n");
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
689 }