annotate lwasm/pseudo.c @ 240:b43e3e23583c

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