annotate lwasm/pseudo.c @ 254:c7a41b4c89b3 2.x

Added struct support to LWASM
author lost
date Sat, 19 Dec 2009 06:38:43 +0000
parents f9f01a499525
children e27279180a73
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1 /*
4
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
2 pseudo.c
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
3 Copyright © 2009 William Astle
4
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
4
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
5 This file is part of LWASM.
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
6
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
7 LWASM is free software: you can redistribute it and/or modify it under the
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
8 terms of the GNU General Public License as published by the Free Software
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
9 Foundation, either version 3 of the License, or (at your option) any later
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
10 version.
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
11
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
12 This program is distributed in the hope that it will be useful, but WITHOUT
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
15 more details.
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
16
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
17 You should have received a copy of the GNU General Public License along with
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
18 this program. If not, see <http://www.gnu.org/licenses/>.
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
19
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
20
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
21 This file implements the various pseudo operations.
34568fab6058 Fixed package to include all required files; also added copyright preamble to all source files
lost
parents: 0
diff changeset
22 */
212
bae1e3ecdce1 More preparation for gnulib integration
lost
parents: 202
diff changeset
23 #include <config.h>
225
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
24 #include <errno.h>
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
25 #include <stdio.h>
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
26 #include <stdlib.h>
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
27 #include <string.h>
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
28 #include "lwasm.h"
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
29 #include "instab.h"
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
30 #include "expr.h"
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
31 #include "util.h"
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
32
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
33 extern int lwasm_read_file(asmstate_t *as, const char *filename);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
34
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
35 OPFUNC(pseudo_noop)
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
36 {
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
37 skip_operand(p);
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
38 }
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
39
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
40 OPFUNC(pseudo_org)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
41 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
42 int v, r;
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
43
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
44 if (as -> csect)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
45 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
46 register_error(as, l, 1, "ORG not allowed within sections");
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
47 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
48 }
241
31231d1c87e6 Made ORG carp if used inside a mod/emod section
lost
parents: 236
diff changeset
49 if (as -> inmod)
31231d1c87e6 Made ORG carp if used inside a mod/emod section
lost
parents: 236
diff changeset
50 {
31231d1c87e6 Made ORG carp if used inside a mod/emod section
lost
parents: 236
diff changeset
51 register_error(as, l, 1, "ORG not allowed within modules");
31231d1c87e6 Made ORG carp if used inside a mod/emod section
lost
parents: 236
diff changeset
52 return;
31231d1c87e6 Made ORG carp if used inside a mod/emod section
lost
parents: 236
diff changeset
53 }
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
54
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
55 if (as -> passnum != 1)
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
56 {
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
57 // org is not needed to be processed on pass 2
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
58 // this will prevent phasing errors for forward references that
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
59 // resolve on the second pass
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
60 // we saved the org address in l -> codeaddr on pass 1
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
61 as -> addr = l -> codeaddr;
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
62 skip_operand(p);
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
63 return;
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
64 }
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
65
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
66 if (l -> sym)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
67 {
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
68 register_error(as, l, 1, "No symbol allowed with ORG");
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
69 }
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
70
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
71 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
72 if (r != 0)
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
73 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
74 l -> codeaddr = v;
49
21ae0fab469b Added needed infra for useful listing of EQU and ORG type statements
lost
parents: 47
diff changeset
75 l -> addrset = 1;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
76 as -> addr = v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
77 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
78
47
804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base
lost
parents: 4
diff changeset
79 /*
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
80 The operand for include is a string optionally enclosed in "
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
81 */
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
82 OPFUNC(pseudo_include)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
83 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
84 int v1;
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
85 char *fn;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
86
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
87 // only include files on pass 1
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
88 // but make sure local include context is right
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
89 // for the next line...
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
90 if (as -> passnum != 1)
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
91 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
92 as -> context = lwasm_next_context(as);
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
93 skip_operand(p);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
94 return;
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
95 }
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
96
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
97 while (**p && isspace(**p))
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
98 (*p)++;
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
99
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
100 if (!**p)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
101 {
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
102 register_error(as, l, 1, "Bad file name");
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
103 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
104 }
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
105
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
106 if (**p == '"')
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
107 {
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
108 // search for ending "
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
109 (*p)++;
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
110 for (v1 = 0; *((*p)+v1) && *((*p)+v1) != '"'; v1++)
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
111 /* do nothing */ ;
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
112 if (*((*p)+v1) != '"')
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
113 {
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
114 register_error(as, l, 1, "Bad file name");
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
115 return;
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
116 }
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
117 }
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
118 else
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
119 {
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
120 // search for a space type character
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
121 for (v1 = 0; *((*p)+v1) && !isspace(*((*p)+v1)); v1++)
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
122 ;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
123 }
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
124
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
125 fn = lwasm_alloc(v1 + 1);
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
126 memcpy(fn, *p, v1);
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
127 fn[v1] = '\0';
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
128
225
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
129 (*p) += v1;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
130 if (**p == '"')
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
131 (*p)++;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
132
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
133 // end local label context on include
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
134 as -> context = lwasm_next_context(as);
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
135 if (lwasm_read_file(as, fn) < 0)
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
136 {
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
137 register_error(as, l, 1, "File include error (%s)", fn);
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
138 }
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
139 lwasm_free(fn);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
140 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
141
225
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
142 /*
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
143 The operand for includebin is a string optionally enclosed in "
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
144 */
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
145 OPFUNC(pseudo_includebin)
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
146 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
147 int v1;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
148 char *fn;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
149 FILE *f;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
150
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
151 // only include files on pass 1
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
152 while (**p && isspace(**p))
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
153 (*p)++;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
154
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
155 if (!**p)
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
156 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
157 register_error(as, l, 1, "Bad file name");
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
158 return;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
159 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
160
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
161 if (**p == '"')
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
162 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
163 // search for ending "
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
164 (*p)++;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
165 for (v1 = 0; *((*p)+v1) && *((*p)+v1) != '"'; v1++)
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
166 /* do nothing */ ;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
167 if (*((*p)+v1) != '"')
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
168 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
169 register_error(as, l, 1, "Bad file name");
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
170 return;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
171 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
172 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
173 else
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
174 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
175 // search for a space type character
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
176 for (v1 = 0; *((*p)+v1) && !isspace(*((*p)+v1)); v1++)
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
177 ;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
178 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
179
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
180 fn = lwasm_alloc(v1 + 1);
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
181 memcpy(fn, *p, v1);
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
182 fn[v1] = '\0';
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
183
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
184 (*p) += v1;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
185 if (**p == '"')
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
186 (*p)++;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
187
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
188 // open the file
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
189 f = fopen(fn, "rb");
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
190 if (!f)
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
191 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
192 register_error(as, l, 1, "Cannot open file: %s", strerror(errno));
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
193 register_error(as, l, 2, "Cannot open file: %s", strerror(errno));
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
194 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
195
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
196 // don't need fn any more
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
197 lwasm_free(fn);
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
198
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
199 // read the contents of the file and "emit()" it
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
200 while (!feof(f) && !ferror(f))
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
201 {
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
202 v1 = fgetc(f);
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
203 if (v1 == EOF)
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
204 break;
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
205 lwasm_emit(as, l, v1);
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
206 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
207 // close file
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
208 fclose(f);
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
209 }
058f18119025 Fixed filename parsing bug in include directive and added includebin directive
lost
parents: 221
diff changeset
210
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
211 OPFUNC(pseudo_rmb)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
212 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
213 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
214
95
f3497072ac44 Fixed think-o in rm* ops (reversed pass number test)
lost
parents: 94
diff changeset
215 if (as -> passnum == 2)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
216 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
217 as -> addr += l -> nocodelen;
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
218 skip_operand(p);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
219 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
220 }
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
221 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, -1);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
222 if (r != 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
223 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
224 l -> nocodelen = v;
254
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 243
diff changeset
225 if (as -> instruct)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 243
diff changeset
226 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
227 as -> addr += v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
228 }
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
229
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
230 OPFUNC(pseudo_rmd)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
231 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
232 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
233
95
f3497072ac44 Fixed think-o in rm* ops (reversed pass number test)
lost
parents: 94
diff changeset
234 if (as -> passnum == 2)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
235 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
236 as -> addr += l -> nocodelen;
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
237 skip_operand(p);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
238 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
239 }
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
240 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
241 if (r != 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
242 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
243 v *= 2;
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
244 l -> nocodelen = v;
254
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 243
diff changeset
245 if (as -> instruct)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 243
diff changeset
246 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
247 as -> addr += v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
248 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
249
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
250 OPFUNC(pseudo_rmq)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
251 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
252 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
253
95
f3497072ac44 Fixed think-o in rm* ops (reversed pass number test)
lost
parents: 94
diff changeset
254 if (as -> passnum == 2)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
255 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
256 as -> addr += l -> nocodelen;
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
257 skip_operand(p);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
258 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
259 }
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
260 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
261 if (r != 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
262 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
263 v *= 4;
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
264 l -> nocodelen = v;
254
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 243
diff changeset
265 if (as -> instruct)
c7a41b4c89b3 Added struct support to LWASM
lost
parents: 243
diff changeset
266 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
267 as -> addr += v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
268 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
269
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
270 OPFUNC(pseudo_zmb)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
271 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
272 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
273
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
274 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
275 if (r != 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
276 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
277 while (v--)
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
278 lwasm_emit(as, l, 0);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
279 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
280
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
281 OPFUNC(pseudo_zmd)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
282 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
283 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
284
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
285 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
286 if (r != 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
287 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
288 v *= 2;
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
289 while (v--)
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
290 lwasm_emit(as, l, 0);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
291 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
292
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
293 OPFUNC(pseudo_zmq)
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
294 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
295 int r, v;
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
296
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
297 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
298 if (r != 0)
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
299 return;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
300 v *= 4;
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
301 while (v--)
53
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
302 lwasm_emit(as, l, 0);
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
303 }
493cb8ea50a0 Added rm[dq], zm[bdq]
lost
parents: 52
diff changeset
304
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
305 OPFUNC(pseudo_end)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
306 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
307 int r, v;
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
308 lwasm_expr_stack_t *s;
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
309
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
310
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
311 as -> endseen = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
312
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
313 // address only matters for DECB output
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
314 if (as -> outformat != OUTPUT_DECB)
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
315 {
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
316 skip_operand(p);
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
317 return;
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
318 }
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
319
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
320 r = lwasm_expr_result2(as, l, p, 0, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
321 if (r != 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
322 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
323 register_error(as, l, 2, "Bad operand");
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
324 }
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
325
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
326 v = v & 0xffff;
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
327 if (as -> passnum == 2)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
328 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
329 as -> execaddr = v;
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
330 l -> symaddr = v;
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
331 l -> addrset = 2;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
332 }
54
360d53062bb9 Fixed typo in instruction table and added END directive
lost
parents: 53
diff changeset
333 }
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
334
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
335
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
336 OPFUNC(pseudo_align)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
337 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
338 int cn;
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
339 int r, v;
235
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
340 int pad = 0;
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
341 // we have to parse this on pass 2 so that we get the pad value
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
342 // if (as -> passnum == 2)
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
343 // {
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
344 // skip_operand(p);
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
345 // while (as -> addr < l -> symaddr)
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
346 // lwasm_emit(as, l, 0);
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
347 // return;
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
348 // }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
349
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
350 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
351 if (r != 0)
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
352 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
353 l -> symaddr = as -> addr;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
354 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
355 }
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
356
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
357 if (v < 1)
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
358 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
359 register_error(as, l, 1, "Illegal alignment %d", v);
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
360 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
361 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
362
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
363 cn = l -> codeaddr % v;
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
364 if (cn)
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
365 cn = v - cn;
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
366
235
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
367 if (**p == ',')
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
368 {
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
369 // we have a padding value specified
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
370 (*p)++;
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
371 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST, &pad, 1);
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
372 if (r != 0 && as -> passnum == 2)
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
373 {
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
374 register_error(as, l, 2, "Illegal padding value - must be constant on pass 2");
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
375 return;
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
376 }
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
377 }
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
378
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
379 while (cn--)
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
380 {
235
aa0056ca7319 Added a padding value for the ALIGN directive
lost
parents: 229
diff changeset
381 lwasm_emit(as, l, pad);
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
382 }
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
383 l -> symaddr = as -> addr;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
384 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
385
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
386 OPFUNC(pseudo_equ)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
387 {
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
388 int r, v;
52
b9856da2674a Added file inclusion
lost
parents: 50
diff changeset
389
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
390 if (l -> sym == NULL)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
391 {
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
392 register_error(as, l, 1, "No symbol specified");
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
393 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
394 }
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
395
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
396 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
397 if (r < 0)
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
398 v = 0;
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: 57
diff changeset
399
78
121bf4a588ea Checkpointing deployment of non-constant expression handling
lost
parents: 74
diff changeset
400 l -> symaddr = v & 0xFFFF;
50
e672232caffe Added rmb pseudo op
lost
parents: 49
diff changeset
401 l -> addrset = 2;
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: 57
diff changeset
402
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
403 // note: we need to do this because the symbol might have resolved
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
404 // to a constant!
190
563adfccb645 Added 'sym=expr' opcode handling
lost
parents: 162
diff changeset
405 lwasm_register_symbol(as, l, l -> sym, v, (r > 0 ? SYMBOL_COMPLEX: SYMBOL_NORM) | SYMBOL_FORCE | (l -> forceglobal ? SYMBOL_GLOBAL : SYMBOL_NORM));
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
406 }
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: 57
diff changeset
407
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: 57
diff changeset
408 OPFUNC(pseudo_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: 57
diff changeset
409 {
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
410 int r, v;
64
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
411
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
412 // set MUST run on both passes as the symbol value changes!
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
413
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
414 if (l -> sym == NULL)
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
415 {
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
416 register_error(as, l, 1, "No symbol specified");
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
417 return;
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
418 }
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
419
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
420 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
421 if (r < 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
422 v = 0;
64
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
423
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
424 l -> symaddr = v & 0xFFFF;
64
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
425 l -> addrset = 2;
aaddd47219b4 Added the 'set' directive
lost
parents: 63
diff changeset
426
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
427 lwasm_register_symbol(as, l, l -> sym, v, (r > 0 ? SYMBOL_COMPLEX: SYMBOL_NORM) | SYMBOL_SET);
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: 57
diff changeset
428 }
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: 57
diff changeset
429
65
31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux()
lost
parents: 64
diff changeset
430 OPFUNC(pseudo_setdp)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
431 {
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
432 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
433
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
434 if (as -> outformat == OUTPUT_OBJ)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
435 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
436 register_error(as, l, 1, "SETDP not permitted with OBJ target");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
437 return;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
438 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
439
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
440 // setdp is needed on both passes; must resolve to a constant on pass 1
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
441 r = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
442 if (r != 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
443 return;
65
31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux()
lost
parents: 64
diff changeset
444
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
445 if (v < -127 || v > 255)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
446 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
447 register_error(as, l, 1, "Byte overflow");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
448 return;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
449 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
450
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
451 l -> symaddr = v & 0xFF;
65
31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux()
lost
parents: 64
diff changeset
452 l -> addrset = 2;
31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux()
lost
parents: 64
diff changeset
453
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
454 as -> dpval = v & 0xFF;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
455 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
456
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
457 // used to get a byte from a string
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
458 // -1 is end of line
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
459 int pseudo_fcc_fetchchar(asmstate_t *as, char **p)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
460 {
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
461 int c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
462
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
463 // -
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
464 if (!**p)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
465 return -1;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
466
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
467 c = (unsigned char)(**p);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
468 (*p)++;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
469
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
470 if (as -> pragmas & PRAGMA_CESCAPES && c == '\\')
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
471 {
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
472 // decode escapes if needed
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
473 if (!**p)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
474 return c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
475
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
476 c = **p;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
477 (*p)++;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
478
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
479 switch (c)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
480 {
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
481 // octal value
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
482 // 1, 2, or 3 digits
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
483 // NOTE: \0 for NUL is included in this...
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
484 case '0':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
485 case '1':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
486 case '2':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
487 case '3':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
488 case '4':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
489 case '5':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
490 case '6':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
491 case '7':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
492 c -= '0';
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
493 if (**p < '0' || **p > '9')
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
494 return c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
495 c = c << 3;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
496 c |= **p - '0';
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
497 (*p)++;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
498 if (**p < '0' || **p > '9')
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
499 return c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
500 c = c << 3;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
501 c |= **p - '0';
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
502 (*p)++;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
503 return c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
504
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
505 // LF
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
506 case 'n':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
507 return 10;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
508
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
509 // CR
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
510 case 'r':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
511 return 13;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
512
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
513 // TAB
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
514 case 't':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
515 return 9;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
516
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
517 // VT
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
518 case 'v':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
519 return 11;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
520
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
521 // BS
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
522 case 'b':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
523 return 8;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
524
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
525 // FF
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
526 case 'f':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
527 return 12;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
528
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
529 // BEL
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
530 case 'a':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
531 return 7;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
532
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
533 // hex char code (2 chars)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
534 case 'x':
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
535 {
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
536 int c2;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
537 if (!**p)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
538 return 'x';
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
539 c = toupper(**p);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
540 (*p)++;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
541 if (c < '0' || (c > '9' && c < 'A') || c > 'F')
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
542 return 0;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
543 c -= '0';
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
544 if (c > 9)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
545 c -= 7;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
546 c2 = c << 4;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
547 if (!**p)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
548 return 0;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
549 c = toupper(**p);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
550 (*p)++;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
551 if (c < '0' || (c > '9' && c < 'A') || c > 'F')
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
552 return 0;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
553 c -= '0';
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
554 if (c > 9)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
555 c -= 7;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
556 c2 |= c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
557 return c2;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
558 }
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
559 // everything else stands for itself as a fall back or legit
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
560 default:
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
561 return c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
562 }
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
563 }
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
564 return c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
565 }
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
566
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
567 OPFUNC(pseudo_fcc)
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
568 {
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
569 int delim = 0;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
570 int c;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
571
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
572 delim = **p;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
573 if (!delim)
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
574 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
575 register_error(as, l, 1, "Bad operand");
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
576 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
577 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
578 *p += 1;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
579 for (;;)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
580 {
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
581 c = pseudo_fcc_fetchchar(as, p);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
582 if (c == delim || c < 0)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
583 break;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
584
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
585 lwasm_emit(as, l, c);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
586 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
587 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
588
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
589
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
590 OPFUNC(pseudo_fcs)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
591 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
592 int delim = 0;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
593 int c, lc = -1;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
594
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
595 delim = **p;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
596 if (!delim)
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
597 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
598 register_error(as, l, 1, "Bad operand");
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
599 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
600 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
601 *p += 1;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
602 for (;;)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
603 {
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
604 c = pseudo_fcc_fetchchar(as, p);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
605 if (c == delim || c < 0)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
606 {
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
607 if (lc >= 0)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
608 lwasm_emit(as, l, lc | 0x80);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
609 break;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
610 }
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
611 if (lc >= 0)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
612 lwasm_emit(as, l, lc);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
613 lc = c;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
614 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
615 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
616
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
617 OPFUNC(pseudo_fcn)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
618 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
619 int delim = 0;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
620 int c;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
621
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
622 delim = **p;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
623 if (!delim)
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
624 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
625 register_error(as, l, 1, "Bad operand");
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
626 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
627 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
628 *p += 1;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
629 for (;;)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
630 {
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
631 c = pseudo_fcc_fetchchar(as, p);
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
632 if (c == delim || c < 0)
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
633 break;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
634
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
635 lwasm_emit(as, l, c);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
636 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
637 lwasm_emit(as, l, 0);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
638 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
639
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
640 OPFUNC(pseudo_fcb)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
641 {
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
642 int r, v;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
643
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
644 fcb_again:
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
645 r = lwasm_expr_result2(as, l, p, 0, &v, -1);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
646 if (r < 0)
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
647 return;
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
648
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
649 if (r > 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
650 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
651 register_error(as, l, 2, "Illegal external or inter-segment reference");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
652 v = 0;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
653 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
654
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
655 if (v < -127 || v > 255)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
656 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
657 register_error(as, l, 1, "Byte overflow");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
658 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
659
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
660 lwasm_emit(as, l, v);
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
661 if (**p == ',')
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
662 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
663 (*p)++;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
664 goto fcb_again;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
665 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
666 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
667
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
668 // FIXME: handle external references in an intelligent way
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
669 OPFUNC(pseudo_fdb)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
670 {
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
671 int r, v;
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
672 int extseen = 0;
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
673 char *p1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
674
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
675 fdb_again:
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
676 p1 = *p;
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
677 r = lwasm_expr_result2(as, l, p, 0, &v, -1);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
678 if (r < 0)
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
679 return;
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
680
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
681 if (r > 0 && extseen == 1)
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
682 {
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
683 register_error(as, l, 2, "Illegal external or inter-segment reference (only 1 per FDB line)");
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
684 v = 0;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
685 }
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
686 else if (r > 0)
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
687 {
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
688 l -> relocoff = as -> addr - l -> codeaddr;
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
689 *p = p1;
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
690 r = lwasm_expr_result2(as, l, p, 0, &v, 0);
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
691 }
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
692
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
693 lwasm_emit(as, l, v >> 8);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
694 lwasm_emit(as, l, v & 0xff);
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
695 if (**p == ',')
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
696 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
697 (*p)++;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
698 goto fdb_again;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
699 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
700 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
701
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
702 // FIXME: handle external references in a sensible way
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
703 OPFUNC(pseudo_fqb)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
704 {
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
705 int r, v;
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
706
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
707 fqb_again:
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
708 r = lwasm_expr_result2(as, l, p, 0, &v, -1);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
709 if (r < 0)
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
710 return;
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
711
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
712 if (r > 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
713 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
714 register_error(as, l, 2, "Illegal external or inter-segment reference");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
715 v = 0;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
716 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
717
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
718 lwasm_emit(as, l, v >> 24);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
719 lwasm_emit(as, l, v >> 16);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
720 lwasm_emit(as, l, v >> 8);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
721 lwasm_emit(as, l, v & 0xff);
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
722 if (**p == ',')
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
723 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
724 (*p)++;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
725 goto fqb_again;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
726 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
727 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
728
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
729 // don't need to do anything if we are executing one of these
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
730 OPFUNC(pseudo_endc)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
731 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
732 if (as -> skipcond && !(as -> skipmacro))
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
733 {
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
734 as -> skipcount -= 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
735 if (as -> skipcount <= 0)
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
736 {
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
737 as -> skipcond = 0;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
738 }
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
739 }
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
740 return;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
741 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
742
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
743 // if "else" executes, we must be going into an "ignore" state
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
744 OPFUNC(pseudo_else)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
745 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
746 if (as -> skipmacro)
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
747 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
748
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
749 if (as -> skipcond)
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
750 {
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
751 if (as -> skipcount == 1)
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
752 {
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
753 as -> skipcount = 0;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
754 as -> skipcond = 0;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
755 }
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
756 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
757 }
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
758
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
759 as -> skipcond = 1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
760 as -> skipcount = 1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
761 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
762
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
763 OPFUNC(pseudo_ifne)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
764 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
765 int v1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
766 int rval;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
767
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
768 if (as -> skipcond && !(as -> skipmacro))
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
769 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
770 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
771 skip_operand(p);
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
772 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
773 }
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
774
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
775 rval = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v1, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
776 if (rval != 0)
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
777 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
778 if (!v1)
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
779 {
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
780 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
781 as -> skipcount = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
782 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
783 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
784
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
785 OPFUNC(pseudo_ifdef)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
786 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
787 lwasm_symbol_ent_t *se;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
788 char *sym;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
789 char *p2;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
790
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
791 if (as -> skipcond && !(as -> skipmacro))
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
792 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
793 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
794 skip_operand(p);
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
795 return;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
796 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
797
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
798 if (as -> passnum != 1)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
799 {
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
800 skip_operand(p);
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
801 if (!(l -> fsize))
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
802 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
803 as -> skipcond = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
804 as -> skipcount = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
805 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
806 return;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
807 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
808
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
809 if (!**p)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
810 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
811 register_error(as, l, 1, "Need symbol name");
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
812 return;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
813 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
814
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
815 for (p2 = *p; **p && !isspace(**p); (*p)++)
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
816 /* do nothing */ ;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
817
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
818 sym = lwasm_alloc(*p - p2 + 1);
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
819 memcpy(sym, p2, *p - p2);
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
820 sym[*p - p2] = '\0';
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
821
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
822 // fprintf(stderr, "STUFF: %s; '%s'; '%s' (%d)\n", p2, *p, sym, as -> passnum);
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
823 se = lwasm_find_symbol(as, sym, l -> context);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
824 if (!se)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
825 se = lwasm_find_symbol(as, sym, -1);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
826
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
827 lwasm_free(sym);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
828
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
829 if (!se)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
830 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
831 as -> skipcond = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
832 as -> skipcount = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
833 l -> fsize = 0;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
834 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
835 else
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
836 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
837 l -> fsize = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
838 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
839 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
840
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
841 OPFUNC(pseudo_ifndef)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
842 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
843 lwasm_symbol_ent_t *se;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
844 char *sym;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
845 char *p2;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
846
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
847 if (as -> skipcond && !(as -> skipmacro))
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
848 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
849 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
850 skip_operand(p);
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
851 return;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
852 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
853
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
854 if (as -> passnum != 1)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
855 {
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
856 skip_operand(p);
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
857 if (l -> fsize)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
858 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
859 as -> skipcond = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
860 as -> skipcount = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
861 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
862 return;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
863 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
864
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
865 if (!**p)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
866 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
867 register_error(as, l, 1, "Need symbol name");
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
868 return;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
869 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
870
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
871 for (p2 = *p; *p2 && !isspace(*p2); p2++)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
872 /* do nothing */ ;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
873
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
874 sym = lwasm_alloc(p2 - *p + 1);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
875 memcpy(sym, *p, p2 - *p);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
876 sym[p2 - *p] = '\0';
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
877
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
878 *p = p2;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
879
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
880 // fprintf(stderr, "STUFF2: %s; '%s'; '%s' (%d)\n", *p, p2, sym, as -> passnum);
104
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
881 se = lwasm_find_symbol(as, sym, l -> context);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
882 if (!se)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
883 se = lwasm_find_symbol(as, sym, -1);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
884
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
885 lwasm_free(sym);
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
886
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
887 if (se)
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
888 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
889 as -> skipcond = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
890 as -> skipcount = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
891 l -> fsize = 0;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
892 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
893 else
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
894 {
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
895 l -> fsize = 1;
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
896 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
897 }
2ba8f9ef1417 Added ifdef/ifndef conditionals
lost
parents: 103
diff changeset
898
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
899 OPFUNC(pseudo_ifp1)
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
900 {
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
901 if (as -> skipcond && !(as -> skipmacro))
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
902 {
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
903 as -> skipcount++;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
904 skip_operand(p);
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
905 return;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
906 }
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
907
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
908 if (as -> passnum != 1)
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
909 {
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
910 as -> skipcond = 1;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
911 as -> skipcount = 1;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
912 }
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
913 }
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
914
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
915 OPFUNC(pseudo_ifp2)
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
916 {
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
917 if (as -> skipcond && !(as -> skipmacro))
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
918 {
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
919 as -> skipcount++;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
920 skip_operand(p);
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
921 return;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
922 }
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
923
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
924 if (as -> passnum != 2)
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
925 {
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
926 as -> skipcond = 1;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
927 as -> skipcount = 1;
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
928 }
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
929 }
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
930
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
931 OPFUNC(pseudo_ifeq)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
932 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
933 int v1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
934 int rval;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
935
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
936 if (as -> skipcond && !(as -> skipmacro))
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
937 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
938 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
939 skip_operand(p);
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
940 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
941 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
942
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
943 rval = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v1, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
944 if (rval != 0)
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
945 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
946 if (v1)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
947 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
948 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
949 as -> skipcount = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
950 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
951 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
952
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
953 OPFUNC(pseudo_iflt)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
954 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
955 int v1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
956 int rval;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
957
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
958 if (as -> skipcond && !(as -> skipmacro))
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
959 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
960 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
961 skip_operand(p);
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
962 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
963 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
964
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
965 rval = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v1, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
966 if (rval != 0)
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
967 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
968 if (v1 >= 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
969 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
970 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
971 as -> skipcount = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
972 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
973 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
974
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
975 OPFUNC(pseudo_ifle)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
976 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
977 int v1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
978 int rval;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
979
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
980 if (as -> skipcond && !(as -> skipmacro))
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
981 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
982 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
983 skip_operand(p);
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
984 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
985 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
986
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
987 rval = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v1, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
988 if (rval != 0)
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
989 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
990 if (v1 > 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
991 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
992 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
993 as -> skipcount = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
994 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
995 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
996
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
997 OPFUNC(pseudo_ifgt)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
998 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
999 int v1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1000 int rval;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1001
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1002 if (as -> skipcond && !(as -> skipmacro))
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1003 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1004 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
1005 skip_operand(p);
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1006 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1007 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1008
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
1009 rval = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v1, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
1010 if (rval != 0)
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1011 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1012 if (v1 <= 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1013 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1014 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1015 as -> skipcount = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1016 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1017 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1018
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1019 OPFUNC(pseudo_ifge)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1020 {
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1021 int v1;
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1022 int rval;
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1023
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1024 if (as -> skipcond && !(as -> skipmacro))
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1025 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1026 as -> skipcount++;
236
a58f49a77441 Added os9 target, pragma to control whether $ localizes a symbol, and fixed some condition nesting bugs
lost
parents: 235
diff changeset
1027 skip_operand(p);
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1028 return;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1029 }
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1030
103
26c058fa0bc1 Fixed up some issues with pseudo ops and object target
lost
parents: 99
diff changeset
1031 rval = lwasm_expr_result2(as, l, p, EXPR_SECTCONST | EXPR_PASS1CONST, &v1, 0);
79
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling
lost
parents: 78
diff changeset
1032 if (rval != 0)
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1033 return;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1034 if (v1 < 0)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1035 {
57
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1036 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros
lost
parents: 56
diff changeset
1037 as -> skipcount = 1;
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1038 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1039 }
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1040
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
1041 OPFUNC(pseudo_error)
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1042 {
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
1043 register_error(as, l, 1, "User error: %s", *p);
0
57495da01900 Initial checking of LWASM
lost
parents:
diff changeset
1044 }
56
55260a178667 Added from f* pseudo ops
lost
parents: 54
diff changeset
1045
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1046
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1047 OPFUNC(pseudo_section)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1048 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1049 sectiontab_t *s;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1050 char *p2;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1051 char *sn;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1052 char *opts;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1053
99
3dcb12a6f4ff Fixed problem handling sections with options on pass 2
lost
parents: 95
diff changeset
1054
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1055 if (as -> outformat != OUTPUT_OBJ)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1056 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1057 register_error(as, l, 1, "Sections only supported for obj target");
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1058 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1059 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1060
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1061 if (as -> csect)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1062 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1063 as -> csect -> offset = as -> addr;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1064 as -> csect = NULL;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1065 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1066
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1067 if (!**p)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1068 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1069 register_error(as, l, 1, "Need section name");
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1070 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1071 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1072
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1073 for (p2 = *p; *p2 && !isspace(*p2); p2++)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1074 /* do nothing */ ;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1075
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1076 sn = lwasm_alloc(p2 - *p + 1);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1077 memcpy(sn, *p, p2 - *p);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1078 sn[p2 - *p] = '\0';
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1079
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1080 *p = p2;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1081
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1082 opts = strchr(sn, ',');
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1083 if (opts)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1084 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1085 *opts++ = '\0';
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1086 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1087
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1088 // have we seen the section name already?
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1089 for (s = as -> sections; s; s = s -> next)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1090 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1091 if (!strcmp(s -> name, sn))
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1092 break;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1093 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1094
99
3dcb12a6f4ff Fixed problem handling sections with options on pass 2
lost
parents: 95
diff changeset
1095 if (s && as -> passnum == 1)
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1096 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1097 lwasm_free(sn);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1098 if (opts)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1099 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1100 register_error(as, l, 1, "Section options can only be specified the first time");
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1101 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1102 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1103 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1104 else if (!s)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1105 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1106 s = lwasm_alloc(sizeof(sectiontab_t));
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1107 s -> name = sn;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1108 s -> offset = 0;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1109 s -> flags = 0;
85
918be0c02239 Started adding object target output
lost
parents: 82
diff changeset
1110 s -> obytes = NULL;
918be0c02239 Started adding object target output
lost
parents: 82
diff changeset
1111 s -> oblen = 0;
918be0c02239 Started adding object target output
lost
parents: 82
diff changeset
1112 s -> obsize = 0;
86
033a328a10ae Checkpoint: object target output
lost
parents: 85
diff changeset
1113 s -> rl = NULL;
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1114 s -> exports = NULL;
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1115 // if name of section is "bss" or ".bss", assume bss flag
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1116 // which can be overridden with !bss flag
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1117 if (!strcasecmp(sn, "bss") || !strcasecmp(sn, ".bss"))
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1118 s -> flags = SECTION_BSS;
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1119 // parse options; only one "bss"
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1120 if (opts && as -> passnum == 1)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1121 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1122 if (!strcasecmp(opts, "bss"))
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1123 {
160
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1124 s -> flags |= SECTION_BSS;
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1125 }
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1126 else if (!strcasecmp(opts, "!bss"))
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1127 {
b061350c17e4 Added cescapes pragma and a few other compatibility pseudo ops
lost
parents: 158
diff changeset
1128 s -> flags &= ~SECTION_BSS;
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1129 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1130 else
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1131 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1132 register_error(as, l, 1, "Unrecognized section option '%s'", opts);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1133 lwasm_free(s -> name);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1134 lwasm_free(s);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1135 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1136 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1137 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1138
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1139 s -> next = as -> sections;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1140 as -> sections = s;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1141 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1142 as -> addr = s -> offset;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1143 as -> csect = s;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1144 as -> context = lwasm_next_context(as);
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1145 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1146
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1147 OPFUNC(pseudo_endsection)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1148 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1149 if (as -> outformat != OUTPUT_OBJ)
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1150 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1151 register_error(as, l, 1, "Sections only supported for obj target");
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1152 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1153 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1154
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1155 if (!(as -> csect))
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1156 {
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1157 register_error(as, l, 1, "ENDSECTION when not in a section");
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1158 return;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1159 }
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1160
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1161 as -> csect -> offset = as -> addr;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1162 as -> addr = 0;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1163 as -> csect = 0;
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1164 as -> context = lwasm_next_context(as);
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1165 skip_operand(p);
74
c8c772ef5df9 Checkpointing object target implementation
lost
parents: 65
diff changeset
1166 }
82
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1167
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1168 OPFUNC(pseudo_extern)
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1169 {
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1170 if (as -> passnum != 1)
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1171 return;
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1172
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1173 if (as -> outformat != OUTPUT_OBJ)
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1174 {
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1175 register_error(as, l, 1, "External references only supported for obj target");
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1176 return;
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1177 }
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1178
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1179 if (as -> csect)
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1180 {
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1181 register_error(as, l, 1, "Cannot declare external symbols within a section");
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1182 return;
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1183 }
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1184
221
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1185 if (l -> sym)
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1186 {
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1187 lwasm_register_symbol(as, l, l -> sym, 0, SYMBOL_EXTERN);
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1188 for ( ; **p; (*p)++) ;
221
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1189 return;
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1190 }
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1191
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1192 while (**p)
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1193 {
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1194 char *sym2, *sym3;
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1195 for (sym2 = *p; **p && !isspace(**p) && **p != ','; (*p)++)
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1196 /* do nothing */ ;
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1197
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1198 if (l -> sym)
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1199 lwasm_free(l -> sym);
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1200
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1201 sym3 = lwasm_alloc(*p - sym2 + 1);
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1202 memcpy(sym3, sym2, *p - sym2);
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1203 sym3[*p - sym2] = '\0';
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1204
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1205 l -> sym = sym3;
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1206 debug_message(2, "import symbol: '%s'", sym3);
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1207 lwasm_register_symbol(as, l, l -> sym, 0, SYMBOL_EXTERN);
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1208 if (**p && (**p != ','))
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1209 {
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1210 register_error(as, l, 1, "Bad import list");
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1211 return;
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1212 }
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1213 if (**p == ',')
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1214 (*p)++;
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1215 }
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1216 if (!(l -> sym))
271c0ef9ea60 Fixed segfault in import/extern pseudo op
lost
parents: 212
diff changeset
1217 register_error(as, l, 1, "Bad import list");
82
03be43ae19cf Added EXTERN directive
lost
parents: 79
diff changeset
1218 }
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1219
243
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1220 OPFUNC(pseudo_extdep)
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1221 {
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1222 if (as -> passnum != 1)
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1223 return;
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1224
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1225 if (as -> outformat != OUTPUT_OBJ)
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1226 {
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1227 register_error(as, l, 1, "External references only supported for obj target");
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1228 return;
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1229 }
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1230
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1231 if (l -> sym)
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1232 {
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1233 // add symbol to the "ext dep" list
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1234 as -> extdeps = lwasm_realloc(as -> extdeps, sizeof(char *) * (as -> nextdeps + 1));
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1235 as -> extdeps[as -> nextdeps++] = lwasm_strdup(l -> sym);
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1236 return;
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1237 }
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1238 }
f9f01a499525 Added zero-width external references
lost
parents: 241
diff changeset
1239
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1240 OPFUNC(pseudo_export)
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1241 {
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1242 lwasm_symbol_ent_t *se;
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1243 export_list_t *ex;
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1244 char *sym2, *sym3;
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1245 int after = 0;
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1246
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1247 if (as -> outformat != OUTPUT_OBJ)
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1248 {
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1249 register_error(as, l, 1, "Symbol exports only supported for obj target");
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1250 return;
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1251 }
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1252
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1253 if (as -> passnum == 1)
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1254 {
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1255 skip_operand(p);
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1256 return;
229
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1257 }
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1258
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1259 if (l -> sym)
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1260 {
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1261 for ( ; **p; (*p)++) ;
59a138df0401 Fixed additional parsing problems with pseudo ops
lost
parents: 225
diff changeset
1262 }
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1263
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1264 again:
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1265 if (!(l -> sym) || after == 1)
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1266 {
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1267
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1268 after = 1;
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1269 // look for symbol after op
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1270 if (**p)
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1271 {
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1272 for (sym2 = *p; **p && !isspace(**p) && **p != ','; (*p)++)
162
02ada556bcc0 Fixed stupid error with for loop
lost
parents: 160
diff changeset
1273 /* do nothing */ ;
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1274
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1275 debug_message(2, "export expression: %s", sym2);
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1276 if (l -> sym)
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1277 lwasm_free(l -> sym);
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1278 sym3 = lwasm_alloc(*p - sym2 + 1);
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1279 memcpy(sym3, sym2, *p - sym2);
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1280 sym3[*p - sym2] = '\0';
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1281
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1282 l -> sym = sym3;
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1283 debug_message(2, "export symbol: '%s'", sym3);
158
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1284 }
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1285 }
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1286 if (!(l -> sym))
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1287 {
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1288 register_error(as, l, 2, "No symbol");
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1289 return;
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1290 }
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1291
f0527dc3804d Added support for .globl <sym>, .area <section>, .word, .byte, .blkb, and a .module directive that does nothing
lost
parents: 151
diff changeset
1292
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1293 // the symbol better be defined at this point (pass 2)
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1294 // local symbols cannot be exported nor can "global" symbols
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1295 se = lwasm_find_symbol(as, l -> sym, -1);
202
1a75121c3c3f Yet again try to get importing undefined exports working
lost
parents: 201
diff changeset
1296 if ((!se || (se -> flags & SYMBOL_EXTERN)) && (as -> pragmas & PRAGMA_IMPORTUNDEFEXPORT))
198
6ddc861a07d4 Allow export to import undefined symbols
lost
parents: 192
diff changeset
1297 {
201
7824f94c5786 take 2: importing undefined exports
lost
parents: 199
diff changeset
1298 void *p;
7824f94c5786 take 2: importing undefined exports
lost
parents: 199
diff changeset
1299 p = as -> csect;
7824f94c5786 take 2: importing undefined exports
lost
parents: 199
diff changeset
1300 as -> csect = NULL;
198
6ddc861a07d4 Allow export to import undefined symbols
lost
parents: 192
diff changeset
1301 lwasm_register_symbol(as, l, l -> sym, 0, SYMBOL_EXTERN);
201
7824f94c5786 take 2: importing undefined exports
lost
parents: 199
diff changeset
1302 as -> csect = p;
198
6ddc861a07d4 Allow export to import undefined symbols
lost
parents: 192
diff changeset
1303 }
199
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1304 else
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1305 {
201
7824f94c5786 take 2: importing undefined exports
lost
parents: 199
diff changeset
1306 if (!se)
199
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1307 {
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1308 register_error(as, l, 2, "Exported symbols must be fully defined within a section");
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1309 return;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1310 }
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1311 if (se -> sect == NULL)
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1312 {
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1313 register_error(as, l, 2, "Only non-local symbols within a section can be exported");
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1314 return;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1315 }
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1316
199
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1317 if (se -> flags & SYMBOL_SET)
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1318 {
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1319 register_error(as, l, 2, "You cannot export symbols defined with SET");
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1320 return;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1321 }
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1322
199
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1323 // if the symbol is not already a simple value, re-evaluate it
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1324 // and see if it becomes simple
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1325
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1326
199
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1327 if (se -> flags & SYMBOL_COMPLEX)
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1328 {
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1329 register_error(as, l, 2, "Exported symbols must be fully resolved on pass 2");
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1330 return;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1331 }
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1332
199
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1333 // search for existing export
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1334 for (ex = se -> sect -> exports; ex; ex = ex -> next)
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1335 if (!strcmp(l -> sym, ex -> sym))
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1336 break;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1337 if (ex)
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1338 {
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1339 register_error(as, l, 2, "Symbol %s already exported", l -> sym);
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1340 return;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1341 }
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1342
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1343 // add an external reference
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1344 ex = lwasm_alloc(sizeof(export_list_t));
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1345 ex -> next = se -> sect -> exports;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1346 se -> sect -> exports = ex;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1347 ex -> offset = se -> value;
188037f0397c Allow export to import undefined symbols
lost
parents: 198
diff changeset
1348 ex -> sym = lwasm_strdup(se -> sym);
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1349 }
202
1a75121c3c3f Yet again try to get importing undefined exports working
lost
parents: 201
diff changeset
1350 next:
192
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1351 if (after == 1)
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1352 {
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1353 if (**p == ',')
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1354 {
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1355 debug_message(2, "Export another symbol: %s", *p);
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1356 (*p)++;
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1357 for ( ; **p && isspace(**p); (*p)++)
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1358 /* do nothing */ ;
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1359 goto again;
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1360 }
bfd0fb0a85c2 Allow exporting multiple symbols on a single directive
lost
parents: 190
diff changeset
1361 }
90
6097cb1486f8 Added EXPORT pseudo op
lost
parents: 86
diff changeset
1362 }