Mercurial > hg-old > index.cgi
annotate src/symbol.c @ 125:f9bfc2986023
Actually allow script file to be specified and fix segfault on parsing script file
author | lost |
---|---|
date | Fri, 23 Jan 2009 04:53:01 +0000 |
parents | ea2cfebef5d0 |
children | 0ee5f65bccf9 |
rev | line source |
---|---|
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
1 /* |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
2 symbol.c |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
3 Copyright © 2009 William Astle |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
4 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
5 This file is part of LWASM. |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
6 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
7 LWASM is free software: you can redistribute it and/or modify it under the |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
8 terms of the GNU General Public License as published by the Free Software |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
9 Foundation, either version 3 of the License, or (at your option) any later |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
10 version. |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
11 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
12 This program is distributed in the hope that it will be useful, but WITHOUT |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
15 more details. |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
16 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
17 You should have received a copy of the GNU General Public License along with |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
18 this program. If not, see <http://www.gnu.org/licenses/>. |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
19 */ |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
20 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
21 /* |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
22 for handling the symbol table |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
23 */ |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
24 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
25 #define __symbol_c_seen__ |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
26 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
27 #include <string.h> |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
28 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
29 #include "lwasm.h" |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
30 #include "util.h" |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
31 #include "expr.h" |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
32 |
40
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
33 /* |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
34 Note that this function may accept symbols that the expression evaluator doesn't |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
35 recognize because the expression evaluator must avoid all ambiguity in order |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
36 to achieve predictable results. The checks here are simply a fuzz check. |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
37 */ |
77 | 38 |
39 /* | |
40 NOTE: complex symbols always take their value from slot 0 on the expression placeholders | |
41 for a line! | |
42 */ | |
64 | 43 int lwasm_register_symbol(asmstate_t *as, lwasm_line_t *l, char *sym, int val, int flags) |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
44 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
45 lwasm_symbol_ent_t *se, *se2; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
46 char *p; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
47 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
48 int scontext = -1; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
49 |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
50 // if the symbol is constant, fall back to simple registration! |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
51 if (flags & SYMBOL_COMPLEX) |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
52 { |
77 | 53 if (l -> exprs[0] == NULL) |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
54 { |
77 | 55 val = l -> exprvals[0]; |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
56 flags &= ~SYMBOL_COMPLEX; |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
57 } |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
58 } |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
59 |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
60 // first check if the symbol is valid |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
61 // the following characters are allowed in a symbol: |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
62 // [a-zA-Z0-9._$?@] and any byte value larger than 0x7F |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
63 // although symbols should be restricted to the 7 bit range |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
64 // symbols must start with [a-zA-Z._] |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
65 if (!strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz._@?", *sym)) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
66 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
67 register_error(as, l, 1, "Bad symbol: %s", sym); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
68 return -1; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
69 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
70 |
40
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
71 if (*sym == '@' && isdigit(sym[1])) |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
72 { |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
73 register_error(as, l, 1, "Bad symbol: %s", sym); |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
74 return -1; |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
75 } |
d2cee0c335e7
adjusted symbol rules to accept symbols starting with @ but not @<digit>
lost
parents:
37
diff
changeset
|
76 |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
77 for (p = sym; *p; p++) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
78 { |
52 | 79 if (!strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz._$?@0123456789", *sym)) |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
80 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
81 register_error(as, l, 1, "Bad symbol: %s", sym); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
82 return -1; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
83 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
84 // flag local symbols while we're at it... |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
85 if (*p == '?' || *p == '@') |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
86 scontext = as -> context; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
87 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
88 |
64 | 89 debug_message(3, "lwasm_register_symbol(): registering '%s' (%d) at %04X; flags=%d", sym, scontext, val, flags); |
58 | 90 |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
91 // now look it for to see if it is a duplicate |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
92 se = lwasm_find_symbol(as, sym, scontext); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
93 if (se) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
94 { |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
95 if (flags & SYMBOL_FORCE && as -> passnum != 2) |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
96 { |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
97 register_error(as, l, 1, "Multiply defined symbol: %s", sym); |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
98 return -1; |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
99 } |
64 | 100 if (!(flags & SYMBOL_SET) || (flags & SYMBOL_SET && !(se -> flags & SYMBOL_SET))) |
101 { | |
102 register_error(as, l, 1, "Mulitply defined symbol: %s", sym); | |
103 return -1; | |
104 } | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
105 } |
64 | 106 if (se) |
107 { | |
108 se -> value = val; | |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
109 if (flags & SYMBOL_COMPLEX) |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
110 { |
77 | 111 se -> expr = l -> exprs[0]; |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
112 } |
79
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
113 else |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
114 { |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
115 se -> expr = NULL; |
d0ce3f5f6797
Checkpointing deployment of non-constant expression handling
lost
parents:
77
diff
changeset
|
116 } |
64 | 117 return; |
118 } | |
119 | |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
120 // if not a duplicate, register it with the value |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
121 se = lwasm_alloc(sizeof(lwasm_symbol_ent_t)); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
122 if (as -> symhead) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
123 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
124 se -> prev = NULL; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
125 se -> next = as -> symhead; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
126 as -> symhead -> prev = se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
127 as -> symhead = se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
128 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
129 else |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
130 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
131 se -> next = NULL; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
132 se -> prev = NULL; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
133 as -> symhead = se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
134 as -> symtail = se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
135 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
136 se -> value = val; |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
137 if (flags & SYMBOL_COMPLEX) |
77 | 138 se -> expr = l -> exprs[0]; |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
139 se -> sym = lwasm_strdup(sym); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
140 se -> context = scontext; |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
141 se -> sect = as -> csect; |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
142 se -> expr = NULL; |
64 | 143 se -> flags = flags; |
82 | 144 se -> externalname = NULL; |
37
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
145 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
146 return 0; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
147 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
148 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
149 lwasm_symbol_ent_t *lwasm_find_symbol(asmstate_t *as, char *sym, int scontext) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
150 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
151 lwasm_symbol_ent_t *se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
152 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
153 for (se = as -> symhead; se; se = se -> next) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
154 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
155 if (scontext == se -> context && !strcmp(sym, se -> sym)) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
156 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
157 return se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
158 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
159 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
160 return NULL; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
161 } |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
162 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
163 // reset the value of a symbol - should not be used normally |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
164 // it is intended for use by such operations as EQU |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
165 // returns -1 if the symbol is not registered |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
166 int lwasm_set_symbol(asmstate_t *as, char *sym, int scontext, int val) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
167 { |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
168 lwasm_symbol_ent_t *se; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
169 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
170 se = lwasm_find_symbol(as, sym, scontext); |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
171 if (!se) |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
172 return -1; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
173 |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
174 se -> value = val; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
175 return 0; |
538e15927776
Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents:
diff
changeset
|
176 } |
58 | 177 |
178 void lwasm_list_symbols(asmstate_t *as, FILE *lf) | |
179 { | |
180 lwasm_symbol_ent_t *se; | |
181 | |
182 for (se = as -> symhead; se; se = se -> next) | |
183 { | |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
184 if (se -> expr) |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
185 { |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
186 fprintf(lf, "<incompl>"); |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
187 } |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
188 else if (se -> value > 0xffff || se -> value < -0x8000) |
58 | 189 { |
190 fprintf(lf, "%08X ", se -> value); | |
191 } | |
192 else | |
193 { | |
194 fprintf(lf, " %04X ", se -> value); | |
195 } | |
196 if (se -> context < 0) | |
197 fputc('G', lf); | |
198 else | |
199 fputc('L', lf); | |
200 | |
63
d85ba47b1e8f
Moved symbol registration so symbols that are in skipped code do not get registered and so EQU/SET can do their own registration
lost
parents:
58
diff
changeset
|
201 if (se -> flags & SYMBOL_SET) |
d85ba47b1e8f
Moved symbol registration so symbols that are in skipped code do not get registered and so EQU/SET can do their own registration
lost
parents:
58
diff
changeset
|
202 fputc('S', lf); |
92
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
82
diff
changeset
|
203 else if (se -> flags & SYMBOL_EXTERN) |
ea2cfebef5d0
Make external symbols remain unresolved in expressions and also flag them in the symbol list
lost
parents:
82
diff
changeset
|
204 fputc('E', lf); |
63
d85ba47b1e8f
Moved symbol registration so symbols that are in skipped code do not get registered and so EQU/SET can do their own registration
lost
parents:
58
diff
changeset
|
205 else |
d85ba47b1e8f
Moved symbol registration so symbols that are in skipped code do not get registered and so EQU/SET can do their own registration
lost
parents:
58
diff
changeset
|
206 fputc(' ', lf); |
d85ba47b1e8f
Moved symbol registration so symbols that are in skipped code do not get registered and so EQU/SET can do their own registration
lost
parents:
58
diff
changeset
|
207 |
58 | 208 fprintf(lf, " %s", se -> sym); |
209 | |
210 if (se -> context >= 0) | |
211 fprintf(lf, " (%d)", se -> context); | |
212 | |
75
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
213 if (se -> sect) |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
214 { |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
215 fprintf(lf, " [%s]", se -> sect -> name); |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
216 } |
92eb93bffa28
Rejigged symbol system to be able to handle non-constant references
lost
parents:
64
diff
changeset
|
217 |
58 | 218 fputc('\n', lf); |
219 } | |
220 } |