Mercurial > hg-old > index.cgi

annotate lwasm/parse.c @ 265:68fbca173508 2.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added generated files for release
author lost
date Tue, 22 Dec 2009 05:31:23 +0000
parents 6363b9ebf825
children 6d09310438a4
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;
255
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
63
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
64 // check if there is a line number and ignore it if there is
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
65 if (isdigit(*p))
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
66 {
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
67 for (p2 = p; *p2 && isdigit(*p2); p2++)
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
68 /* do nothing */ ;
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
69
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
70 // we have a line number, skip it and the *first*
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
71 // whitespace character
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
72 if (!*p2 || isspace(*p2))
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
73 p = p2 + 1;
6363b9ebf825 Support files with line numbers in lwasm
lost
parents: 254
diff changeset
74 }
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
75
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
76 // 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
77 if (*p == '*' || *p == ';')
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
78 return;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
79
169
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
80 // if we have C pre-processor directives/output, ignore it
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
81 if (*p == '#')
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
82 return;
99300be2d3bd Allow lines starting with # to be ignored
lost
parents: 157
diff changeset
83
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
84 // if we start with a non-space character, it's a symbol
244
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
85 symbolagain:
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
86 if (!isspace(*p))
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
87 {
253
c537a3a723fc Fixed obscure comment detection bug
lost
parents: 250
diff changeset
88 // if it starts with a comment character, it's not a symbol
c537a3a723fc Fixed obscure comment detection bug
lost
parents: 250
diff changeset
89 if (*p == ';' || *p == '*')
c537a3a723fc Fixed obscure comment detection bug
lost
parents: 250
diff changeset
90 return;
c537a3a723fc Fixed obscure comment detection bug
lost
parents: 250
diff changeset
91
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
92 // we have a symbol specified here
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
93 // parse it out and record it for later use
157
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
94 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
95 /* do nothing */ ;
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
96
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
97 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
98 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
99 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
100
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
101 p = p2;
157
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
102 if (!*sym)
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
103 {
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
104 register_error(as, l, 1, "Invalid symbol");
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
105 lwasm_free(sym);
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
106 sym = NULL;
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
107 }
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
108 if (*p == ':')
745721e13970 allow : after symbol at line start
lost
parents: 151
diff changeset
109 p++;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
110 }
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
111 l -> sym = sym;
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
112
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
113 // now skip any whitespace to find the opcode
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
114 while (*p && isspace(*p))
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
115 p++;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
116
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
117 // is the line blank?
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
118 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
119 {
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
120 // nothing but white space *is* a context break
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
121 as -> context = lwasm_next_context(as);
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
122 return;
37
538e15927776 Added symbol handling to expression subsystem; adpated instruction handlers to the new scheme; misc fixes
lost
parents: 36
diff changeset
123 }
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
124
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
125 // parse the opcode
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
126 for (p2 = p; *p2 && !isspace(*p2); p2++)
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
127 /* do nothing */ ;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
128
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
129 opc = lwasm_alloc((p2 - p) + 1);
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
130 memcpy(opc, p, p2 - p);
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
131 opc[p2 - p] = '\0';
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
132
244
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
133 if (strchr(opc, ':'))
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
134 {
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
135 lwasm_free(opc);
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
136 goto symbolagain;
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
137 }
c8bcc396ec59 Allow symbols to appear after whitespace when terminated by :
lost
parents: 236
diff changeset
138
190
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
139 l -> forceglobal = 0;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
140 // if the opcode contains an =, treat it as "symbol = expr"
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
141 if (!sym && strchr(opc, '='))
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
142 {
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
143 for (p2 = opc; *p2 && *p2 != '='; p2++)
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
144 /* do nothing */ ;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
145 sym = lwasm_alloc((p2 - opc) + 1);
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
146 memcpy(sym, opc, p2 - opc);
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
147 sym[p2 - opc] = '\0';
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
148 l -> sym = sym;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
149
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
150 p2 = p + (p2 - opc) + 1;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
151 // p2++;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
152 opc[0] = '=';
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
153 opc[1] = '\0';
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
154 debug_message(2, "Found opcode = with symbol %s and operand %s", sym, p2);
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
155 l -> forceglobal = 1;
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
156 }
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 169
diff changeset
157
38
9bd584bb6296 Added debugging message infrastructure
lost
parents: 37
diff changeset
158 debug_message(2, "Found operation code: '%s'", opc);
9bd584bb6296 Added debugging message infrastructure
lost
parents: 37
diff changeset
159
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
160 // skip intervening whitespace if present
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
161 while (*p2 && isspace(*p2))
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
162 p2++;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
163
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
164 // look up instruction in insn table
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
165 for (opnum = 0; instab[opnum].opcode; opnum++)
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
166 {
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
167 if (!strcasecmp(instab[opnum].opcode, opc))
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
168 break;
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
169 }
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
170
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
171 // 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
172 // 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
173 // 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
174 // other assemblers
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
175 // also skip empty ops
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
176 if (!(instab[opnum].opcode))
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
177 {
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
178 if (*opc == '*' || *opc == ';' || !*opc)
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
179 goto done_line;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
180 }
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
181
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
182 // 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
183 // actually going to do anything with this line
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
184
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
185 // 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
186
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
187 // - 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
188 // - 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
189
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
190 // 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
191
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
192 // first condition above
57
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
193 if (as -> inmacro && instab[opnum].endm == 0)
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
194 {
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
195 add_macro_line(as, l -> text);
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
196 goto done_line;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
197 }
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
198
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
199 // second condition above
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
200 if (as -> skipcond && instab[opnum].iscond == 0)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
201 goto done_line;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
202
254
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
203 if (as -> instruct && as -> passnum == 1)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
204 {
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
205 structtab_t *s = NULL;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
206 struct struct_sym_e *e, *e2;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
207
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
208 // look for a structure if not an acceptable opcode
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
209 if (!instab[opnum].opcode)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
210 {
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
211 for (s = as -> structs; s; s = s -> next)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
212 {
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
213 if (s == as -> cstruct)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
214 continue;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
215 if (!strcmp(opc, s -> name))
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
216 goto isok;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
217 }
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
218 }
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
219 // check for a "reservation opcode"
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
220 if (instab[opnum].opcode && instab[opnum].isreserve)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
221 {
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
222 (instab[opnum].fn)(as, l, &p2, opnum);
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
223
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
224 // if we didn't end on a "space" character or EOL, throw error
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
225 if (p2 && *p2 && !isspace(*p2) && !(l -> err) && as -> passnum == 1)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
226 register_error(as, l, 1, "Bad operand: %s (%d)", p2, as -> passnum);
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
227
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
228 if (as -> instruct == 0)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
229 goto done_line;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
230
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
231 goto isok;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
232 }
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
233 // carp if not valid
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
234 register_error(as, l, 1, "Only other structs and rmb allowed in struct");
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
235 l -> badop = 1;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
236 goto done_line;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
237
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
238 isok:
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
239 for (e2 = as -> cstruct -> fields; e2 && e2 -> next; e2 = e2 -> next)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
240 /* do nothing */ ;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
241 e = lwasm_alloc(sizeof(struct struct_sym_e));
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
242 e -> next = NULL;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
243 e -> substruct = s;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
244 if (sym)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
245 e -> name = lwasm_strdup(sym);
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
246 else
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
247 e -> name = NULL;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
248 if (s)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
249 e -> size = s -> size;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
250 else
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
251 e -> size = l -> nocodelen;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
252 if (e2)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
253 e2 -> next = e;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
254 else
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
255 as -> cstruct -> fields = e;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
256 as -> cstruct -> size += e -> size;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
257 }
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
258
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
259 // we've registered the symbol as needed
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
260 // 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
261 // an operation code; otherwise, call the operation function
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
262 if (instab[opnum].opcode)
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
263 {
230
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
264 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
265 {
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
266 (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
267
436b36214e35 Fixed lack of error when there are extraneous characters at the end of the operand.
lost
parents: 212
diff changeset
268 // if we didn't end on a "space" character or EOL, throw error
250
0986834ec7d3 Added no-op .bank pseudo-op to support compiling gcc6809
lost
parents: 244
diff changeset
269 if (p2 && *p2 && !isspace(*p2) && !(l -> err) && as -> passnum == 1)
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 230
diff changeset
270 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
271 }
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
272 else
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
273 {
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
274 // carp about unimplemented operation
230
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
275 if (instab[opnum].is6309)
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
276 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
277 else
0df2a39a268c Added --6809/--6309 switches and some cleanups in error reporting
lost
parents: 223
diff changeset
278 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
279 }
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
280 }
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
281 else
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
282 {
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
283 if (expand_macro(as, l, &p2, opc) == 0)
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
284 goto done_line;
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
285
254
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
286 if (expand_struct(as, l, &p2, opc) == 0)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
287 goto done_line;
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
288
66
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
289 // 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
290 // 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
291 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
292 l -> badop = 1;
aa9d9fedfdf4 Redid lwasm_parse_line() to correct overly complex logic flaws
lost
parents: 64
diff changeset
293 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
294
035b95a3690f Added conditional assembly and macros
lost
parents: 52
diff changeset
295 done_line:
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
296 if (!(as -> skipcond || as -> inmacro))
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
297 {
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
298 // register symbol if the operation didn't
254
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 253
diff changeset
299 if (sym && instab[opnum].setsym == 0 && as -> instruct == 0)
68
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
300 {
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
301 if (as -> passnum == 1)
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
302 {
71
90a5657d5408 Fixed problem with symbols being registered with the address of the NEXT instruction
lost
parents: 68
diff changeset
303 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
304 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
305 l -> sym = NULL;
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
306 else
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
307 l -> addrset = 1;
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
308 }
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
309 }
cef25b0088e6 Fixed some problems detected by valgrind and testing
lost
parents: 66
diff changeset
310 }
99
3dcb12a6f4ff Fixed problem handling sections with options on pass 2
lost
parents: 91
diff changeset
311
85
918be0c02239 Started adding object target output
lost
parents: 71
diff changeset
312 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
313 l -> context = as -> context;
85
918be0c02239 Started adding object target output
lost
parents: 71
diff changeset
314
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
315 lwasm_free(opc);
44
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
316 if (sym)
2330b88f9600 Added simple output listing
lost
parents: 38
diff changeset
317 lwasm_free(sym);
36
99e3b3310bac Added missing parse.c file to repository
lost
parents:
diff changeset
318 }