LWTools Old Repo: lwasm/pseudo.c annotate

annotate lwasm/pseudo.c @ 261:c79b3c88adbc 2.x

Added --depend option to generate a list of dependencies

author	lost
date	Sat, 26 Dec 2009 08:24:35 +0000
parents	e27279180a73
children

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

Mercurial > hg-old > index.cgi

annotate lwasm/pseudo.c @ 261:c79b3c88adbc 2.x