Mercurial > hg-old > index.cgi

annotate lwasm/lwasm.c @ 391:c1d83336e1d1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
author lost@l-w.ca
date Wed, 21 Jul 2010 21:26:43 -0600
parents a741d2e4869f
children a2f52e97b454
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
375
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
38 int lwasm_expr_exportable(asmstate_t *as, lw_expr_t expr)
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
39 {
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
40 return 0;
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
41 }
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
42
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
43 int lwasm_expr_exportval(asmstate_t *as, lw_expr_t expr)
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
44 {
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
45 return 0;
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
46 }
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
47
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
48 lw_expr_t lwasm_evaluate_var(char *var, void *priv)
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
49 {
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
50 asmstate_t *as = (asmstate_t *)priv;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
51 lw_expr_t e;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
52 importlist_t *im;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
53 struct symtabe *s;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
54
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
55 s = lookup_symbol(as, as -> cl, var);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
56 if (s)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
57 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
58 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
59 return e;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
60 }
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 // undefined here is undefied unless output is object
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
63 if (as -> output_format != OUTPUT_OBJ)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
64 goto nomatch;
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 // check for import
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
67 for (im = as -> importlist; im; im = im -> next)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
68 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
69 if (!strcmp(im -> symbol, var))
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
70 break;
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
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
73 // check for "undefined" to import automatically
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
74 if (!im && CURPRAGMA(as -> cl, PRAGMA_UNDEFEXTERN))
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
75 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
76 im = lw_alloc(sizeof(importlist_t));
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
77 im -> symbol = lw_strdup(var);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
78 im -> next = as -> importlist;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
79 as -> importlist = im;
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
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
82 if (!im)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
83 goto nomatch;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
84
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
85 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
86 return e;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
87
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
88 nomatch:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
89 if (as -> badsymerr)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
90 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
91 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
92 }
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
93 return NULL;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
94 }
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
95
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
96 lw_expr_t lwasm_evaluate_special(int t, void *ptr, void *priv)
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
97 {
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
98 switch (t)
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
99 {
375
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
100 case lwasm_expr_secbase:
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
101 {
385
cf8c92d70eb1 Various bugfixes
lost@starbug
parents: 382
diff changeset
102 // sectiontab_t *s = priv;
cf8c92d70eb1 Various bugfixes
lost@starbug
parents: 382
diff changeset
103 asmstate_t *as = priv;
cf8c92d70eb1 Various bugfixes
lost@starbug
parents: 382
diff changeset
104 if (as -> exportcheck && ptr == as -> csect)
375
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
105 return lw_expr_build(lw_expr_type_int, 0);
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
106 return NULL;
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
107 }
3498b2d88376 Added export list to object output
lost@starbug
parents: 374
diff changeset
108
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
109 case lwasm_expr_linelen:
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
110 {
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
111 line_t *cl = ptr;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
112 if (cl -> len == -1)
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
113 return NULL;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
114 return lw_expr_build(lw_expr_type_int, cl -> len);
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
115 }
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
116 break;
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
117
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
118 case lwasm_expr_lineaddr:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
119 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
120 line_t *cl = ptr;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
121 if (cl -> addr)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
122 return lw_expr_copy(cl -> addr);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
123 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
124 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
125 }
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
126
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
127 case lwasm_expr_syment:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
128 {
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 363
diff changeset
129 struct symtabe *sym = ptr;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 363
diff changeset
130 return lw_expr_copy(sym -> value);
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
131 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
132
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
133 case lwasm_expr_import:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
134 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
135 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
136 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
137
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
138 case lwasm_expr_nextbp:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
139 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
140 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
141 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
142
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
143 case lwasm_expr_prevbp:
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
144 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
145 return NULL;
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
146 }
337
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
147 }
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
148 return NULL;
04c80c51b16a Checkpoint development
lost
parents:
diff changeset
149 }
344
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
150
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
151 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
152 {
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
153 lwasm_error_t *e;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
154 va_list args;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
155 char errbuff[1024];
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
156 int r;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
157
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
158 if (!l)
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
159 return;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
160
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
161 va_start(args, msg);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
162
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
163 e = lw_alloc(sizeof(lwasm_error_t));
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
164
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
165 e -> next = l -> err;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
166 l -> err = e;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
167
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
168 as -> errorcount++;
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
169
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
170 r = vsnprintf(errbuff, 1024, msg, args);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
171 e -> mess = lw_strdup(errbuff);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
172
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
173 va_end(args);
0215a0fbf61b Added assembly error system and additional checks for symbol syntax
lost@starbug
parents: 337
diff changeset
174 }
345
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
175
351
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
176 void lwasm_register_warning(asmstate_t *as, line_t *l, const char *msg, ...)
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
177 {
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
178 lwasm_error_t *e;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
179 va_list args;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
180 char errbuff[1024];
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
181 int r;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
182
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
183 if (!l)
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
184 return;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
185
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
186 va_start(args, msg);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
187
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
188 e = lw_alloc(sizeof(lwasm_error_t));
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
189
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
190 e -> next = l -> err;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
191 l -> err = e;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
192
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
193 as -> errorcount++;
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
194
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
195 r = vsnprintf(errbuff, 1024, msg, args);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
196 e -> mess = lw_strdup(errbuff);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
197
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
198 va_end(args);
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
199 }
4dba8c7e242c conditional pseudo ops added
lost@starbug
parents: 348
diff changeset
200
345
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
201 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
202 {
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
203 int r;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
204 r = as -> nextcontext;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
205 as -> nextcontext++;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
206 return r;
7416c3f9c321 Basic macro processor ported forward; added context break handling for local symbols
lost@starbug
parents: 344
diff changeset
207 }
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
208
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
209 void lwasm_emit(line_t *cl, int byte)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
210 {
374
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
211 if (cl -> outputl < 0)
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
212 cl -> outputl = 0;
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
213
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
214 if (cl -> outputl == cl -> outputbl)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
215 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
216 cl -> output = lw_realloc(cl -> output, cl -> outputbl + 8);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
217 cl -> outputbl += 8;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
218 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
219 cl -> output[cl -> outputl++] = byte & 0xff;
354
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 if (cl -> inmod)
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
222 {
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
223 asmstate_t *as = cl -> as;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
224 // update module CRC
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
225 // this is a direct transliteration from the nitros9 asm source
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
226 // to C; it can, no doubt, be optimized for 32 bit processing
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
227 byte &= 0xff;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
228
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
229 byte ^= (as -> crc)[0];
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
230 (as -> crc)[0] = (as -> crc)[1];
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
231 (as -> crc)[1] = (as -> crc)[2];
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
232 (as -> crc)[1] ^= (byte >> 7);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
233 (as -> crc)[2] = (byte << 1);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
234 (as -> crc)[1] ^= (byte >> 2);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
235 (as -> crc)[2] ^= (byte << 6);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
236 byte ^= (byte << 1);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
237 byte ^= (byte << 2);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
238 byte ^= (byte << 4);
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
239 if (byte & 0x80)
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
240 {
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
241 (as -> crc)[0] ^= 0x80;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
242 (as -> crc)[2] ^= 0x21;
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
243 }
60568b123281 Added os9 opcodes and ERROR
lost@starbug
parents: 351
diff changeset
244 }
346
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
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
247 void lwasm_emitop(line_t *cl, int opc)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
248 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
249 if (opc > 0x100)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
250 lwasm_emit(cl, opc >> 8);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
251 lwasm_emit(cl, opc);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
252 }
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 lw_expr_t lwasm_parse_term(char **p, void *priv)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
255 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
256 asmstate_t *as = priv;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
257 int val;
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 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
260 return NULL;
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 if (**p == '*' || (
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
263 **p == '.'
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
264 && !((*p)[1] >= 'A' && (*p)[1] <= 'Z')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
265 && !((*p)[1] >= 'a' && (*p)[1] <= 'z')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
266 && !((*p)[1] >= '0' && (*p)[1] <= '9')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
267 ))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
268 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
269 // special "symbol" for current line addr (*, .)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
270 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
271 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
272 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
273
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
274 // branch points
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
275 if (**p == '<')
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 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
278 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
279 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
280 if (**p == '>')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
281 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
282 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
283 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
284 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
285
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
286 // double ascii constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
287 if (**p == '"')
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 int v;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
290 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
291 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
292 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
293 if (!*((*p)+1))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
294 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
295 v = (unsigned char)**p << 8 | (unsigned char)*((*p)+1);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
296 (*p) += 2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
297 return lw_expr_build(lw_expr_type_int, v);
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
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
300 if (**p == '\'')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
301 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
302 int v;
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 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
305 if (!**p)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
306 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
307
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
308 v = (unsigned char)**p;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
309 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
310 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
311 }
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 == '&')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
314 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
315 // decimal constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
316 int v = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
317 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
318
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
319 if (!strchr("0123456789", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
320 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
321
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
322 while (**p && strchr("0123456789", **p))
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 val = val * 10 + (**p - '0');
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
325 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
326 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
327 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
328 }
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 (**p == '%')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
331 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
332 // binary constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
333 int v = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
334 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
335
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
336 if (**p != '0' && **p != '1')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
337 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
338
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
339 while (**p && (**p == '0' || **p == '1'))
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 val = val * 2 + (**p - '0');
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
342 (*p)++;
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 return lw_expr_build(lw_expr_type_int, v);
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
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
347 if (**p == '$')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
348 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
349 // hexadecimal constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
350 int v = 0, v2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
351 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
352 if (!strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
353 return NULL;
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 while (**p && strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
356 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
357 v2 = toupper(**p) - '0';
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
358 if (v2 > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
359 v2 -= 7;
382
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
360 v = v * 16 + v2;
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
361 (*p)++;
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 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
364 }
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 if (**p == '0' && (*((*p)+1) == 'x' || *((*p)+1) == 'X'))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
367 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
368 // hexadecimal constant, C style
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
369 int v = 0, v2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
370 (*p)+=2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
371
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
372 if (!strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
373 return NULL;
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 while (**p && strchr("0123456789abcdefABCDEF", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
376 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
377 v2 = toupper(**p) - '0';
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
378 if (v2 > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
379 v2 -= 7;
382
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
380 v = v * 16 + v2;
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
381 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
382 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
383 return lw_expr_build(lw_expr_type_int, v);
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
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
386 if (**p == '@' && (*((*p)+1) >= '0' && *((*p)+1) <= '7'))
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 // octal constant
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
389 int v = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
390 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
391
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
392 if (!strchr("01234567", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
393 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
394
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
395 while (**p && strchr("01234567", **p))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
396 {
382
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
397 v = v * 8 + (**p - '0');
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
398 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
399 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
400 return lw_expr_build(lw_expr_type_int, v);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
401 }
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
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
404 // symbol or bare decimal or suffix constant here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
405 do
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
406 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
407 int havedol = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
408 int l = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
409
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
410 while ((*p)[l] && strchr(SYMCHARS, (*p)[l]))
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
411 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
412 if ((*p)[l] == '$')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
413 havedol = 1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
414 l++;
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 if (l == 0)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
417 return NULL;
391
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
418
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
419 if ((*p)[l] == '{')
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
420 {
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
421 while ((*p)[l] && (*p)[l] != '}')
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
422 l++;
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
423 l++;
c1d83336e1d1 Fixed problem with structure member registration and fixed detection of operator{} type symbols in expression evaluation
lost@l-w.ca
parents: 387
diff changeset
424 }
346
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 if (havedol || **p < '0' || **p > '9')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
427 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
428 // have a symbol here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
429 char *sym;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
430 lw_expr_t term;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
431
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
432 sym = lw_strndup(*p, l);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
433 (*p) += l;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
434 term = lw_expr_build(lw_expr_type_var, sym);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
435 lw_free(sym);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
436 return term;
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 } while (0);
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 if (!**p)
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 // 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
444 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
445 int decval = 0, binval = 0, hexval = 0, octval = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
446 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
447 int bindone = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
448 int val;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
449 int dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
450
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
451 while (1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
452 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
453 if (!**p || !strchr("0123456789ABCDEFabcdefqhoQHO", **p))
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 // we can legally be bin or decimal here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
456 if (bindone)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
457 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
458 // just finished a binary value
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
459 val = binval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
460 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
461 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
462 else if (valtype & 4)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
463 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
464 val = decval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
465 break;
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 else
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 // bad value
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
470 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
471 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
472 }
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 dval = toupper(**p);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
475 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
476
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
477 if (bindone)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
478 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
479 // any characters past "B" means it is not binary
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
480 bindone = 0;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
481 valtype &= 14;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
482 }
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 switch (dval)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
485 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
486 case 'Q':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
487 case 'O':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
488 if (valtype & 2)
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 val = octval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
491 valtype = -1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
492 break;
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 else
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 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
497 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
498 /* can't get here */
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
499
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
500 case 'H':
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 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
503 val = hexval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
504 valtype = -1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
505 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
506 }
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 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
509 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
510 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
511 /* can't get here */
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
512
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
513 case 'B':
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
514 // 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
515 // hex number instead of the end of a binary number
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
516 // so it falls through to the digit case
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 // could still be binary of hex
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
520 bindone = 1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
521 valtype = 9;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
522 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
523 /* fall through intented */
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 default:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
526 // digit
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
527 dval -= '0';
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
528 if (dval > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
529 dval -= 7;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
530 if (valtype & 8)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
531 hexval = hexval * 16 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
532 if (valtype & 4)
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 if (dval > 9)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
535 valtype &= 11;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
536 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
537 decval = decval * 10 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
538 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
539 if (valtype & 2)
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 if (dval > 7)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
542 valtype &= 13;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
543 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
544 octval = octval * 8 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
545 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
546 if (valtype & 1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
547 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
548 if (dval > 1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
549 valtype &= 14;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
550 else
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
551 binval = binval * 2 + dval;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
552 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
553 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
554 if (valtype == -1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
555 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
556
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
557 // return if no more valid types
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
558 if (valtype == 0)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
559 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
560
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
561 val = decval; // in case we fall through
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
562 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
563
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
564 // get here if we have a value
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
565 return lw_expr_build(lw_expr_type_int, val);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
566 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
567 // can't get here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
568 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
569
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
570 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
571 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
572 lw_expr_t e;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
573
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
574 e = lw_expr_parse(p, as);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
575
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
576 return e;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 345
diff changeset
577 }
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
578
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
579 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
580 {
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
581 lw_expr_simplify(expr, as);
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
582 }
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
583
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
584 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
585 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
586 struct line_expr_s *e;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
587
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
588 for (e = cl -> exprs; e; e = e -> next)
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 if (e -> id == id)
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 lw_expr_destroy(e -> expr);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
593 e -> expr = expr;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
594 return;
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 }
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 e = lw_alloc(sizeof(struct line_expr_s));
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
599 e -> expr = expr;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
600 e -> id = id;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
601 e -> next = cl -> exprs;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
602 cl -> exprs = e;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
603 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
604
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
605 lw_expr_t lwasm_fetch_expr(line_t *cl, int id)
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 struct line_expr_s *e;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
608
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
609 for (e = cl -> exprs; e; e = e -> next)
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 if (e -> id == id)
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 return e -> expr;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
614 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
615 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
616 return NULL;
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
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
619 void skip_operand(char **p)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
620 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
621 for (; **p && !isspace(**p); (*p)++)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
622 /* do nothing */ ;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
623 }
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 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
626 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
627 int v;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
628
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
629 if (lw_expr_istype(expr, lw_expr_type_int))
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
630 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
631 v = lw_expr_intval(expr);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
632 }
348
11a95c6414b4 Added third func to instab to split resolve and emit logic
lost@starbug
parents: 347
diff changeset
633 // handle external/cross-section/incomplete references here
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
634 else
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
635 {
374
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
636 if (l -> as -> output_format == OUTPUT_OBJ)
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
637 {
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
638 reloctab_t *re;
376
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 375
diff changeset
639 lw_expr_t te;
374
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
640
381
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
641 if (size == 4)
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
642 {
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
643 // create a two part reference because lwlink doesn't
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
644 // support 32 bit references
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
645 lw_expr_t te2;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
646 te = lw_expr_build(lw_expr_type_int, 0x10000);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
647 te2 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_divide, expr, te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
648 lw_expr_destroy(te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
649
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
650 re = lw_alloc(sizeof(reloctab_t));
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
651 re -> next = l -> csect -> reloctab;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
652 l -> csect -> reloctab = re;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
653 te = lw_expr_build(lw_expr_type_int, l -> outputl);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
654 re -> offset = lw_expr_build(lw_expr_type_oper, lw_expr_oper_plus, l -> addr, te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
655 lw_expr_destroy(te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
656 lwasm_reduce_expr(l -> as, re -> offset);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
657 re -> expr = te2;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
658 re -> size = 2;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
659
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
660 te = lw_expr_build(lw_expr_type_int, 0xFFFF);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
661 te2 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_bwand, expr, te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
662 lw_expr_destroy(te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
663
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
664 re = lw_alloc(sizeof(reloctab_t));
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
665 re -> next = l -> csect -> reloctab;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
666 l -> csect -> reloctab = re;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
667 te = lw_expr_build(lw_expr_type_int, l -> outputl + 2);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
668 re -> offset = lw_expr_build(lw_expr_type_oper, lw_expr_oper_plus, l -> addr, te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
669 lw_expr_destroy(te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
670 lwasm_reduce_expr(l -> as, re -> offset);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
671 re -> expr = te2;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
672 re -> size = 2;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
673 }
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
674 else
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
675 {
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
676 // add "expression" record to section table
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
677 re = lw_alloc(sizeof(reloctab_t));
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
678 re -> next = l -> csect -> reloctab;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
679 l -> csect -> reloctab = re;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
680 te = lw_expr_build(lw_expr_type_int, l -> outputl);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
681 re -> offset = lw_expr_build(lw_expr_type_oper, lw_expr_oper_plus, l -> addr, te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
682 lw_expr_destroy(te);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
683 lwasm_reduce_expr(l -> as, re -> offset);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
684 re -> size = size;
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
685 re -> expr = lw_expr_copy(expr);
1624a36f12a3 Properly support 32 bit relocations
lost@starbug
parents: 376
diff changeset
686 }
374
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
687 for (v = 0; v < size; v++)
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
688 lwasm_emit(l, 0);
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
689 return 0;
d99322ef6f21 Stage 1: actually do output
lost@starbug
parents: 371
diff changeset
690 }
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
691 lwasm_register_error(l -> as, l, "Expression not fully resolved");
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
692 return -1;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
693 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
694
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
695 switch (size)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
696 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
697 case 4:
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
698 lwasm_emit(l, v >> 24);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
699 lwasm_emit(l, v >> 16);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
700 /* fallthrough intended */
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
701
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
702 case 2:
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
703 lwasm_emit(l, v >> 8);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
704 /* fallthrough intended */
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
705
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
706 case 1:
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
707 lwasm_emit(l, v);
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
708 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
709
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
710 return 0;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
711 }
357
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
712
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
713 int lwasm_lookupreg2(const char *regs, char **p)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
714 {
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
715 int rval = 0;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
716
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
717 while (*regs)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
718 {
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
719 if (toupper(**p) == *regs)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
720 {
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
721 if (regs[1] == ' ' && !isalpha(*(*p + 1)))
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
722 break;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
723 if (toupper(*(*p + 1)) == regs[1])
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
724 break;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
725 }
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
726 regs += 2;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
727 rval++;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
728 }
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
729 if (!*regs)
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
730 return -1;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
731 if (regs[1] == ' ')
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
732 (*p)++;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
733 else
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
734 (*p) += 2;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
735 return rval;
0cf4948d53b4 Checkpoint - adding actual cpu instructions
lost@starbug
parents: 354
diff changeset
736 }
359
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
737
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
738 int lwasm_lookupreg3(const char *regs, char **p)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
739 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
740 int rval = 0;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
741
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
742 while (*regs)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
743 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
744 if (toupper(**p) == *regs)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
745 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
746 if (regs[1] == ' ' && !isalpha(*(*p + 1)))
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
747 break;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
748 if (toupper(*(*p + 1)) == regs[1])
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
749 {
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
750 if (regs[2] == ' ' && !isalpha(*(*p + 2)))
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
751 break;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
752 if (toupper(*(*p + 2)) == regs[2])
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
753 break;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
754 }
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
755 }
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
756 regs += 3;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
757 rval++;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
758 }
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
759 if (!*regs)
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
760 return -1;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
761 if (regs[1] == ' ')
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
762 (*p)++;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
763 else if (regs[2] == ' ')
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
764 (*p) += 2;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
765 else
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
766 (*p) += 3;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
767 return rval;
f50a54d0293a Indexed part 1
lost@starbug
parents: 357
diff changeset
768 }
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
769
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
770 void lwasm_show_errors(asmstate_t *as)
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
771 {
382
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
772 line_t *cl;
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
773 lwasm_error_t *e;
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
774
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
775 for (cl = as -> line_head; cl; cl = cl -> next)
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
776 {
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
777 if (!(cl -> err) && !(cl -> warn))
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
778 continue;
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
779 for (e = cl -> err; e; e = e -> next)
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
780 {
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
781 fprintf(stderr, "ERROR: %s\n", e -> mess);
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
782 }
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
783 for (e = cl -> warn; e; e = e -> next)
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
784 {
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
785 fprintf(stderr, "WARNING: %s\n", e -> mess);
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
786 }
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
787
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
788 fprintf(stderr, " LINE: %s\n", cl -> ltext);
eacdae8a1575 Various bugfixes
lost@starbug
parents: 381
diff changeset
789 }
363
d96c30e60ddf Added pass2 and various supporting logic including symbol lookups
lost@starbug
parents: 359
diff changeset
790 }
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
791
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
792 /*
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
793 this does any passes and other gymnastics that might be useful
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
794 to see if an expression reduces early
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
795 */
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
796 extern void do_pass3(asmstate_t *as);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
797 extern void do_pass4_aux(asmstate_t *as, int force);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
798
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
799 void lwasm_interim_reduce(asmstate_t *as)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
800 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
801 do_pass3(as);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
802 // do_pass4_aux(as, 0);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
803 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
804
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
805 lw_expr_t lwasm_parse_cond(asmstate_t *as, char **p)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
806 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
807 lw_expr_t e;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
808
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
809 debug_message(as, 250, "Parsing condition");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
810 e = lwasm_parse_expr(as, p);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
811 debug_message(as, 250, "COND EXPR: %s", lw_expr_print(e));
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
812
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
813 if (!e)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
814 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
815 lwasm_register_error(as, as -> cl, "Bad expression");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
816 return NULL;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
817 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
818
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
819 /* we need to simplify the expression here */
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
820 debug_message(as, 250, "Doing interim reductions");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
821 lwasm_interim_reduce(as);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
822 debug_message(as, 250, "COND EXPR: %s", lw_expr_print(e));
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
823 debug_message(as, 250, "Reducing expression");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
824 lwasm_reduce_expr(as, e);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
825 debug_message(as, 250, "COND EXPR: %s", lw_expr_print(e));
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
826 /* lwasm_reduce_expr(as, e);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
827 debug_message(as, 250, "COND EXPR: %s", lw_expr_print(e));
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
828 lwasm_reduce_expr(as, e);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
829 debug_message(as, 250, "COND EXPR: %s", lw_expr_print(e));
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
830 lwasm_reduce_expr(as, e);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
831 debug_message(as, 250, "COND EXPR: %s", lw_expr_print(e));
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
832 */
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
833
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
834 lwasm_save_expr(as -> cl, 4242, e);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
835
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
836 if (!lw_expr_istype(e, lw_expr_type_int))
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
837 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
838 debug_message(as, 250, "Non-constant expression");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
839 lwasm_register_error(as, as -> cl, "Conditions must be constant on pass 1");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
840 return NULL;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
841 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
842 debug_message(as, 250, "Returning expression");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
843 return e;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 385
diff changeset
844 }