annotate lwasm/parse.c @ 274:3010e24bb9c5 2.5

Fix crashing on bad expressions on pass 2
author lost
date Mon, 31 Aug 2009 08:30:13 +0000
parents a58f49a77441
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
1 /*
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
2 parse.c
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
3 Copyright © 2008 William Astle
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
4
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
5 This file is part of LWASM.
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
6
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
7 LWASM is free software: you can redistribute it and/or modify it under the
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
8 terms of the GNU General Public License as published by the Free Software
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
9 Foundation, either version 3 of the License, or (at your option) any later
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
10 version.
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
11
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
12 This program is distributed in the hope that it will be useful, but WITHOUT
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
15 more details.
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
16
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
17 You should have received a copy of the GNU General Public License along with
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
18 this program. If not, see <http://www.gnu.org/licenses/>.
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
19 */
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
20
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
21 /*
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
22 Contains the general parser
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
23 */
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
24
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
25 #define __parse_c_seen__
212
bae1e3ecdce1 More preparation for gnulib integration
lost
parents: 190
diff changeset
26 #include <config.h>
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
27
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
28 #include <ctype.h>
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
29 #include <string.h>
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
30
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
31 #include "lwasm.h"
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
32 #include "instab.h"
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
33 #include "util.h"
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
34
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
35 // parse a line and despatch to the appropriate handlers for opcodes
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
36 int lwasm_parse_line(asmstate_t *as, lwasm_line_t *l)
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
37 {
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
38 char *p, *p2;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
39 char *opc;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
40 int opnum;
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
41 char *sym = NULL;
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
42
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
43 // if this was a bad op first pass (or otherwise a no-process line)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
44 // ignore it
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
45 if (l -> badop)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
46 return;
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
47
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
48 p = l -> text;
101
f59c0916753d Fixed relative branches and PCR addressing to handle constant intra-section references properly
lost
parents: 99
diff changeset
49 l -> sect = as -> csect;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 230
diff changeset
50 l -> inmod = as -> inmod;
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
51
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
52 // blank lines are a no brainer
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
53 if (!*p)
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
54 {
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
55 as -> context = lwasm_next_context(as);
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
56 return 0;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
57 }
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
58
52
b9856da2674a Added file inclusion
lost
parents: 44
diff changeset
59 // for output generation later but only on pass 1
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
60 // also used by some pseudo ops on pass 2
52
b9856da2674a Added file inclusion
lost
parents: 44
diff changeset
61 if (as -> passnum == 1)
b9856da2674a Added file inclusion
lost
parents: 44
diff changeset
62 l -> codeaddr = as -> addr;
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
63
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
64 // if it's a comment, return (this doesn't cause a context change)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
65 if (*p == '*' || *p == ';')
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
66 return;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
67
169
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
68 // if we have C pre-processor directives/output, ignore it
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
69 if (*p == '#')
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
70 return;
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
71
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
72 // if we start with a non-space character, it's a symbol
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
73 if (!isspace(*p))
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
74 {
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
75 // we have a symbol specified here
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
76 // parse it out and record it for later use
157
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
77 for (p2 = p; *p2 && !isspace(*p2) && *p2 != ':'; p2++)
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
78 /* do nothing */ ;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
79
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
80 sym = lwasm_alloc((p2 - p) + 1);
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
81 sym[p2 - p] = '\0';
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
82 memcpy(sym, p, p2 - p);
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
83
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
84 p = p2;
157
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
85 if (!*sym)
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
86 {
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
87 register_error(as, l, 1, "Invalid symbol");
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
88 lwasm_free(sym);
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
89 sym = NULL;
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
90 }
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
91 if (*p == ':')
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
92 p++;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
93 }
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
94 l -> sym = sym;
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
95
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
96 // now skip any whitespace to find the opcode
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
97 while (*p && isspace(*p))
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
98 p++;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
99
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
100 // is the line blank?
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
101 if (!*p && !sym)
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
102 {
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
103 // nothing but white space *is* a context break
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
104 as -> context = lwasm_next_context(as);
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
105 return;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
106 }
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
107
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
108 // parse the opcode
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
109 for (p2 = p; *p2 && !isspace(*p2); p2++)
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
110 /* do nothing */ ;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
111
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
112 opc = lwasm_alloc((p2 - p) + 1);
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
113 memcpy(opc, p, p2 - p);
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
114 opc[p2 - p] = '\0';
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
115
190
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
116 l -> forceglobal = 0;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
117 // if the opcode contains an =, treat it as "symbol = expr"
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
118 if (!sym && strchr(opc, '='))
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
119 {
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
120 for (p2 = opc; *p2 && *p2 != '='; p2++)
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
121 /* do nothing */ ;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
122 sym = lwasm_alloc((p2 - opc) + 1);
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
123 memcpy(sym, opc, p2 - opc);
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
124 sym[p2 - opc] = '\0';
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
125 l -> sym = sym;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
126
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
127 p2 = p + (p2 - opc) + 1;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
128 // p2++;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
129 opc[0] = '=';
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
130 opc[1] = '\0';
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
131 debug_message(2, "Found opcode = with symbol %s and operand %s", sym, p2);
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
132 l -> forceglobal = 1;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
133 }
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
134
38
9bd584bb6296 Added debugging message infrastructure
lost
parents: 37
diff changeset
135 debug_message(2, "Found operation code: '%s'", opc);
9bd584bb6296 Added debugging message infrastructure
lost
parents: 37
diff changeset
136
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
137 // skip intervening whitespace if present
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
138 while (*p2 && isspace(*p2))
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
139 p2++;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
140
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
141 // look up instruction in insn table
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
142 for (opnum = 0; instab[opnum].opcode; opnum++)
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
143 {
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
144 if (!strcasecmp(instab[opnum].opcode, opc))
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
145 break;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
146 }
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
147
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
148 // if we found no operation, check if we had a comment
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
149 // the reason this check is here is to allow for "private"
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
150 // operation codes like "*pragma" which will be ignored by
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
151 // other assemblers
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
152 // also skip empty ops
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
153 if (!(instab[opnum].opcode))
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
154 {
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
155 if (*opc == '*' || *opc == ';' || !*opc)
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
156 goto done_line;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
157 }
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
158
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
159 // now we have the opcode and the symbol, we can decide if we're
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
160 // actually going to do anything with this line
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
161
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
162 // we will NOT call the function if any of the following are true:
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
163
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
164 // - we are skipping a condition and the operation code is not a conditional
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
165 // - we are defining a macro and the operation code is not ENDM
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
166
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
167 // we will call the function in any other circumstance
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
168
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
169 // first condition above
57
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
170 if (as -> inmacro && instab[opnum].endm == 0)
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
171 {
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
172 add_macro_line(as, l -> text);
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
173 goto done_line;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
174 }
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
175
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
176 // second condition above
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
177 if (as -> skipcond && instab[opnum].iscond == 0)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
178 goto done_line;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
179
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
180 // we've registered the symbol as needed
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
181 // now we need to check for a macro call IFF we don't collide with
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
182 // an operation code; otherwise, call the operation function
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
183 if (instab[opnum].opcode)
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
184 {
230
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
185 if (instab[opnum].fn && !(as -> no6309 && instab[opnum].is6309))
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
186 {
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
187 (instab[opnum].fn)(as, l, &p2, opnum);
223
436b36214e35 Fixed lack of error when there are extraneous characters at the end of the operand.
lost
parents: 212
diff changeset
188
436b36214e35 Fixed lack of error when there are extraneous characters at the end of the operand.
lost
parents: 212
diff changeset
189 // if we didn't end on a "space" character or EOL, throw error
274
3010e24bb9c5 Fix crashing on bad expressions on pass 2
lost
parents: 236
diff changeset
190 if (as -> passnum == 1 && *p2 && !isspace(*p2) && !(l -> err))
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 230
diff changeset
191 register_error(as, l, 1, "Bad operand: %s (%d)", p2, as -> passnum);
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
192 }
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
193 else
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
194 {
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
195 // carp about unimplemented operation
230
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
196 if (instab[opnum].is6309)
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
197 register_error(as, l, 1, "Use of 6309 operation code: %s", opc);
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
198 else
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
199 register_error(as, l, 1, "Unimplemented operation code: %s", opc);
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
200 }
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
201 }
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
202 else
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
203 {
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
204 if (expand_macro(as, l, &p2, opc) == 0)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
205 goto done_line;
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
206
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
207 // carp about an unknown operation code and note that fact for
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
208 // pass 2 in case a macro appears later with the same name!
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
209 register_error(as, l, 1, "Uknown operation code: %s", opc);
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
210 l -> badop = 1;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
211 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
212
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
213 done_line:
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
214 if (!(as -> skipcond || as -> inmacro))
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
215 {
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
216 // register symbol if the operation didn't
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
217 if (sym && instab[opnum].setsym == 0)
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
218 {
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
219 if (as -> passnum == 1)
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
220 {
71
90a5657d5408 Fixed problem with symbols being registered with the address of the NEXT instruction
lost
parents: 68
diff changeset
221 debug_message(1, "Registering symbol '%s' at %04X", sym, l -> codeaddr);
90a5657d5408 Fixed problem with symbols being registered with the address of the NEXT instruction
lost
parents: 68
diff changeset
222 if (lwasm_register_symbol(as, l, sym, l -> codeaddr, SYMBOL_NORM) < 0)
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
223 l -> sym = NULL;
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
224 else
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
225 l -> addrset = 1;
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
226 }
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
227 }
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
228 }
99
3dcb12a6f4ff Fixed problem handling sections with options on pass 2
lost
parents: 91
diff changeset
229
85
918be0c02239 Started adding object target output
lost
parents: 71
diff changeset
230 l -> sect = as -> csect;
91
718998b673ee Added incomplete references to object output and added support for section base terms in expression handler
lost
parents: 85
diff changeset
231 l -> context = as -> context;
85
918be0c02239 Started adding object target output
lost
parents: 71
diff changeset
232
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
233 lwasm_free(opc);
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
234 if (sym)
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
235 lwasm_free(sym);
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
236 }