LWTools Old Repo: src/pseudo.c annotate

annotate src/pseudo.c @ 99:3dcb12a6f4ff

Fixed problem handling sections with options on pass 2

author	lost
date	Sat, 17 Jan 2009 07:28:45 +0000
parents	f3497072ac44
children	26c058fa0bc1

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 */
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	23
57495da01900 Initial checking of LWASM lost parents: diff changeset	24 #include <stdlib.h>
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	25 #include <string.h>
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	26 #include "lwasm.h"
57495da01900 Initial checking of LWASM lost parents: diff changeset	27 #include "instab.h"
47 804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base lost parents: 4 diff changeset	28 #include "expr.h"
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	29 #include "util.h"
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	30
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	31 extern int lwasm_read_file(asmstate_t as, const char filename);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	32
47 804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base lost parents: 4 diff changeset	33 OPFUNC(pseudo_org)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	34 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	35 int v, r;
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	36
74 c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	37 if (as -> csect)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	38 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	39 register_error(as, l, 1, "ORG not allowed within sections");
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	40 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	41 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	42
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	43 if (as -> passnum != 1)
b9856da2674a Added file inclusion lost parents: 50 diff changeset	44 {
b9856da2674a Added file inclusion lost parents: 50 diff changeset	45 // org is not needed to be processed on pass 2
b9856da2674a Added file inclusion lost parents: 50 diff changeset	46 // this will prevent phasing errors for forward references that
b9856da2674a Added file inclusion lost parents: 50 diff changeset	47 // resolve on the second pass
b9856da2674a Added file inclusion lost parents: 50 diff changeset	48 // we saved the org address in l -> codeaddr on pass 1
b9856da2674a Added file inclusion lost parents: 50 diff changeset	49 as -> addr = l -> codeaddr;
b9856da2674a Added file inclusion lost parents: 50 diff changeset	50 return;
b9856da2674a Added file inclusion lost parents: 50 diff changeset	51 }
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	52
47 804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base lost parents: 4 diff changeset	53 if (l -> sym)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	54 {
47 804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base lost parents: 4 diff changeset	55 register_error(as, l, 1, "No symbol allowed with ORG");
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	56 }
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	57
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	58 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	59 if (r != 0)
47 804d7465e0f9 Implemented ORG and fixed problems with constants using $, &, or @ to specify base lost parents: 4 diff changeset	60 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	61 l -> codeaddr = v;
49 21ae0fab469b Added needed infra for useful listing of EQU and ORG type statements lost parents: 47 diff changeset	62 l -> addrset = 1;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	63 as -> addr = v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	64 }
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 /*
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	67 The operand for include is a string optionally enclosed in "
b9856da2674a Added file inclusion lost parents: 50 diff changeset	68 */
b9856da2674a Added file inclusion lost parents: 50 diff changeset	69 OPFUNC(pseudo_include)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	70 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	71 int v1;
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	72 char *fn;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	73
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	74 // only include files on pass 1
b9856da2674a Added file inclusion lost parents: 50 diff changeset	75 // but make sure local include context is right
b9856da2674a Added file inclusion lost parents: 50 diff changeset	76 // for the next line...
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	77 if (as -> passnum != 1)
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	78 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	79 as -> context = lwasm_next_context(as);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	80 return;
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	81 }
b9856da2674a Added file inclusion lost parents: 50 diff changeset	82
b9856da2674a Added file inclusion lost parents: 50 diff changeset	83 while (p && isspace(p))
b9856da2674a Added file inclusion lost parents: 50 diff changeset	84 (*p)++;
b9856da2674a Added file inclusion lost parents: 50 diff changeset	85
b9856da2674a Added file inclusion lost parents: 50 diff changeset	86 if (!**p)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	87 {
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	88 register_error(as, l, 1, "Bad file name");
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	89 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	90 }
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	91
b9856da2674a Added file inclusion lost parents: 50 diff changeset	92 if (**p == '"')
b9856da2674a Added file inclusion lost parents: 50 diff changeset	93 {
b9856da2674a Added file inclusion lost parents: 50 diff changeset	94 // search for ending "
b9856da2674a Added file inclusion lost parents: 50 diff changeset	95 (*p)++;
b9856da2674a Added file inclusion lost parents: 50 diff changeset	96 for (v1 = 0; ((p)+v1) && ((p)+v1) != '"'; v1++)
b9856da2674a Added file inclusion lost parents: 50 diff changeset	97 /* do nothing */ ;
b9856da2674a Added file inclusion lost parents: 50 diff changeset	98 if (((p)+v1) != '"')
b9856da2674a Added file inclusion lost parents: 50 diff changeset	99 {
b9856da2674a Added file inclusion lost parents: 50 diff changeset	100 register_error(as, l, 1, "Bad file name");
b9856da2674a Added file inclusion lost parents: 50 diff changeset	101 return;
b9856da2674a Added file inclusion lost parents: 50 diff changeset	102 }
b9856da2674a Added file inclusion lost parents: 50 diff changeset	103 }
b9856da2674a Added file inclusion lost parents: 50 diff changeset	104 else
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	105 {
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	106 // search for a space type character
b9856da2674a Added file inclusion lost parents: 50 diff changeset	107 for (v1 = 0; ((p)+v1) && !isspace(((p)+v1)); v1++)
b9856da2674a Added file inclusion lost parents: 50 diff changeset	108 ;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	109 }
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	110
b9856da2674a Added file inclusion lost parents: 50 diff changeset	111 fn = lwasm_alloc(v1 + 1);
b9856da2674a Added file inclusion lost parents: 50 diff changeset	112 memcpy(fn, *p, v1);
b9856da2674a Added file inclusion lost parents: 50 diff changeset	113 fn[v1] = '\0';
b9856da2674a Added file inclusion lost parents: 50 diff changeset	114
b9856da2674a Added file inclusion lost parents: 50 diff changeset	115 // end local label context on include
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	116 as -> context = lwasm_next_context(as);
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	117 if (lwasm_read_file(as, fn) < 0)
b9856da2674a Added file inclusion lost parents: 50 diff changeset	118 {
b9856da2674a Added file inclusion lost parents: 50 diff changeset	119 register_error(as, l, 1, "File include error (%s)", fn);
b9856da2674a Added file inclusion lost parents: 50 diff changeset	120 }
b9856da2674a Added file inclusion lost parents: 50 diff changeset	121 lwasm_free(fn);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	122 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	123
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	124 OPFUNC(pseudo_rmb)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	125 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	126 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	127
95 f3497072ac44 Fixed think-o in rm* ops (reversed pass number test) lost parents: 94 diff changeset	128 if (as -> passnum == 2)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	129 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	130 as -> addr += l -> nocodelen;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	131 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	132 }
94 83ba34ed11b3 Fixed problem with constant expressions evaluating to 0 when they shouldn't lost parents: 90 diff changeset	133 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, -1);
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	134 if (r != 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	135 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	136 l -> nocodelen = v;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	137 as -> addr += v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	138 }
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	139
493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	140 OPFUNC(pseudo_rmd)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	141 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	142 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	143
95 f3497072ac44 Fixed think-o in rm* ops (reversed pass number test) lost parents: 94 diff changeset	144 if (as -> passnum == 2)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	145 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	146 as -> addr += l -> nocodelen;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	147 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	148 }
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	149 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	150 if (r != 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	151 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	152 v *= 2;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	153 l -> nocodelen = v;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	154 as -> addr += v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	155 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	156
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	157 OPFUNC(pseudo_rmq)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	158 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	159 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	160
95 f3497072ac44 Fixed think-o in rm* ops (reversed pass number test) lost parents: 94 diff changeset	161 if (as -> passnum == 2)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	162 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	163 as -> addr += l -> nocodelen;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	164 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	165 }
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	166 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	167 if (r != 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	168 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	169 v *= 4;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	170 l -> nocodelen = v;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	171 as -> addr += v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	172 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	173
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	174 OPFUNC(pseudo_zmb)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	175 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	176 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	177
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	178 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	179 if (r != 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	180 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	181 while (v--)
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	182 lwasm_emit(as, l, 0);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	183 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	184
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	185 OPFUNC(pseudo_zmd)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	186 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	187 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	188
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	189 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	190 if (r != 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	191 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	192 v *= 2;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	193 while (v--)
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	194 lwasm_emit(as, l, 0);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	195 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	196
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	197 OPFUNC(pseudo_zmq)
493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	198 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	199 int r, v;
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	200
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	201 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	202 if (r != 0)
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	203 return;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	204 v *= 4;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	205 while (v--)
53 493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	206 lwasm_emit(as, l, 0);
493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	207 }
493cb8ea50a0 Added rm[dq], zm[bdq] lost parents: 52 diff changeset	208
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	209 OPFUNC(pseudo_end)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	210 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	211 int r, v;
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	212 lwasm_expr_stack_t *s;
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	213
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	214
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	215 as -> endseen = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	216
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	217 // address only matters for DECB output
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	218 if (as -> outformat != OUTPUT_DECB)
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	219 return;
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	220
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	221 r = lwasm_expr_result2(as, l, p, 0, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	222 if (r != 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	223 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	224 register_error(as, l, 2, "Bad operand");
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	225 }
360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	226
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	227 v = v & 0xffff;
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	228 if (as -> passnum == 2)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	229 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	230 as -> execaddr = v;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	231 l -> symaddr = v;
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	232 l -> addrset = 2;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	233 }
54 360d53062bb9 Fixed typo in instruction table and added END directive lost parents: 53 diff changeset	234 }
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	235
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	236
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	237 OPFUNC(pseudo_align)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	238 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	239 int cn;
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	240 int r, v;
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	241
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	242 if (as -> passnum == 2)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	243 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	244 while (as -> addr < l -> symaddr)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	245 lwasm_emit(as, l, 0);
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	246 return;
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	247 }
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	248
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	249 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	250 if (r != 0)
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	251 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	252 l -> symaddr = as -> addr;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	253 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	254 }
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	255
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	256 if (v < 1)
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	257 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	258 register_error(as, l, 1, "Illegal alignment %d", v);
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	259 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	260 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	261
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	262 cn = l -> codeaddr % v;
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	263 if (cn)
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	264 cn = v - cn;
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	265
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	266 while (cn--)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	267 {
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	268 lwasm_emit(as, l, 0);
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	269 }
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	270 l -> symaddr = as -> addr;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	271 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	272
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	273 OPFUNC(pseudo_equ)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	274 {
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	275 int r, v;
52 b9856da2674a Added file inclusion lost parents: 50 diff changeset	276
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	277 if (l -> sym == NULL)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	278 {
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	279 register_error(as, l, 1, "No symbol specified");
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	280 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	281 }
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	282
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	283 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	284 if (r < 0)
121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	285 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	286
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	287 l -> symaddr = v & 0xFFFF;
50 e672232caffe Added rmb pseudo op lost parents: 49 diff changeset	288 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	289
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	290 // 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	291 // to a constant!
78 121bf4a588ea Checkpointing deployment of non-constant expression handling lost parents: 74 diff changeset	292 lwasm_register_symbol(as, l, l -> sym, v, (r > 0 ? SYMBOL_COMPLEX: SYMBOL_NORM) \| SYMBOL_FORCE);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	293 }
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	294
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	295 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	296 {
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	297 int r, v;
64 aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	298
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	299 // set MUST run on both passes as the symbol value changes!
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	300
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	301 if (l -> sym == NULL)
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	302 {
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	303 register_error(as, l, 1, "No symbol specified");
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	304 return;
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	305 }
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	306
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	307 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	308 if (r < 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	309 v = 0;
64 aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	310
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	311 l -> symaddr = v & 0xFFFF;
64 aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	312 l -> addrset = 2;
aaddd47219b4 Added the 'set' directive lost parents: 63 diff changeset	313
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	314 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	315 }
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	316
65 31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux() lost parents: 64 diff changeset	317 OPFUNC(pseudo_setdp)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	318 {
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	319 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	320
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	321 if (as -> outformat == OUTPUT_OBJ)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	322 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	323 register_error(as, l, 1, "SETDP not permitted with OBJ target");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	324 return;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	325 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	326
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	327 // setdp is needed on both passes; must resolve to a constant on pass 1
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	328 r = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	329 if (r != 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	330 return;
65 31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux() lost parents: 64 diff changeset	331
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	332 if (v < -127 \|\| v > 255)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	333 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	334 register_error(as, l, 1, "Byte overflow");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	335 return;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	336 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	337
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	338 l -> symaddr = v & 0xFF;
65 31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux() lost parents: 64 diff changeset	339 l -> addrset = 2;
31d8e85706e7 Implemented setdp and corrected handling of direct page detection in insn_gen_aux() lost parents: 64 diff changeset	340
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	341 as -> dpval = v & 0xFF;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	342 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	343
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	344 OPFUNC(pseudo_fcc)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	345 {
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	346 int delim = 0;
57495da01900 Initial checking of LWASM lost parents: diff changeset	347
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	348 delim = **p;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	349 if (!delim)
57495da01900 Initial checking of LWASM lost parents: diff changeset	350 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	351 register_error(as, l, 1, "Bad operand");
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	352 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	353 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	354 *p += 1;
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	355 while (p && p != delim)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	356 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	357 lwasm_emit(as, l, **p);
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	358 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	359 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	360 if (**p)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	361 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	362 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	363
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	364
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	365 OPFUNC(pseudo_fcs)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	366 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	367 int delim = 0;
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	368
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	369 delim = **p;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	370 if (!delim)
57495da01900 Initial checking of LWASM lost parents: diff changeset	371 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	372 register_error(as, l, 1, "Bad operand");
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	373 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	374 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	375 *p += 1;
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	376 while (p && p != delim)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	377 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	378 if (!((p) + 1) \|\| ((p) + 1) == delim)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	379 lwasm_emit(as, l, **p \| 0x80);
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	380 else
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	381 lwasm_emit(as, l, **p);
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	382 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	383 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	384 if (**p)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	385 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	386 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	387
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	388 OPFUNC(pseudo_fcn)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	389 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	390 int delim = 0;
57495da01900 Initial checking of LWASM lost parents: diff changeset	391
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	392 delim = **p;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	393 if (!delim)
57495da01900 Initial checking of LWASM lost parents: diff changeset	394 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	395 register_error(as, l, 1, "Bad operand");
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	396 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	397 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	398 *p += 1;
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	399 while (p && p != delim)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	400 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	401 lwasm_emit(as, l, **p);
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	402 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	403 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	404 if (**p)
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	405 (*p)++;
55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	406 lwasm_emit(as, l, 0);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	407 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	408
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	409 // FIXME: handle external, etc., references in a useful manner
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	410 OPFUNC(pseudo_fcb)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	411 {
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	412 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	413
57495da01900 Initial checking of LWASM lost parents: diff changeset	414 fcb_again:
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	415 r = lwasm_expr_result2(as, l, p, 0, &v, -1);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	416 if (r < 0)
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	417 return;
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	418
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	419 if (r > 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	420 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	421 register_error(as, l, 2, "Illegal external or inter-segment reference");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	422 v = 0;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	423 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	424
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	425 if (v < -127 \|\| v > 255)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	426 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	427 register_error(as, l, 1, "Byte overflow");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	428 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	429
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	430 lwasm_emit(as, l, v);
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	431 if (**p == ',')
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	432 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	433 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	434 goto fcb_again;
57495da01900 Initial checking of LWASM lost parents: diff changeset	435 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	436 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	437
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	438 // FIXME: handle external references in an intelligent way
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	439 OPFUNC(pseudo_fdb)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	440 {
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	441 int r, v;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	442
57495da01900 Initial checking of LWASM lost parents: diff changeset	443 fdb_again:
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	444 r = lwasm_expr_result2(as, l, p, 0, &v, -1);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	445 if (r < 0)
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	446 return;
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	447
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	448 if (r > 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	449 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	450 register_error(as, l, 2, "Illegal external or inter-segment reference");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	451 v = 0;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	452 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	453
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	454 lwasm_emit(as, l, v >> 8);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	455 lwasm_emit(as, l, v & 0xff);
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	456 if (**p == ',')
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	457 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	458 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	459 goto fdb_again;
57495da01900 Initial checking of LWASM lost parents: diff changeset	460 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	461 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	462
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	463 // FIXME: handle external references in a sensible way
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	464 OPFUNC(pseudo_fqb)
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;
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	467
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	468 fqb_again:
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	469 r = lwasm_expr_result2(as, l, p, 0, &v, -1);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	470 if (r < 0)
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	471 return;
79 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 if (r > 0)
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	474 {
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	475 register_error(as, l, 2, "Illegal external or inter-segment reference");
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	476 v = 0;
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	477 }
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	478
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	479 lwasm_emit(as, l, v >> 24);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	480 lwasm_emit(as, l, v >> 16);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	481 lwasm_emit(as, l, v >> 8);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	482 lwasm_emit(as, l, v & 0xff);
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	483 if (**p == ',')
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	484 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	485 (*p)++;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	486 goto fqb_again;
57495da01900 Initial checking of LWASM lost parents: diff changeset	487 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	488 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	489
57495da01900 Initial checking of LWASM lost parents: diff changeset	490 // 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	491 OPFUNC(pseudo_endc)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	492 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	493 if (as -> skipcond && !(as -> skipmacro))
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	494 {
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	495 as -> skipcount -= 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	496 if (as -> skipcount <= 0)
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	497 {
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	498 as -> skipcond = 0;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	499 }
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	500 }
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	501 return;
57495da01900 Initial checking of LWASM lost parents: diff changeset	502 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	503
57495da01900 Initial checking of LWASM lost parents: diff changeset	504 // if "else" executes, we must be going into an "ignore" state
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	505 OPFUNC(pseudo_else)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	506 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	507 if (as -> skipmacro)
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	508 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	509
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	510 if (as -> skipcond)
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	511 {
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	512 if (as -> skipcount == 1)
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	513 {
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	514 as -> skipcount = 0;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	515 as -> skipcond = 0;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	516 }
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	517 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	518 }
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	519
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	520 as -> skipcond = 1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	521 as -> skipcount = 1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	522 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	523
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	524 OPFUNC(pseudo_ifne)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	525 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	526 int v1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	527 int rval;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	528
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	529 if (as -> skipcond && !(as -> skipmacro))
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	530 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	531 as -> skipcount++;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	532 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	533 }
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	534
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	535 rval = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v1, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	536 if (rval != 0)
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	537 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	538 if (!v1)
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	539 {
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	540 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	541 as -> skipcount = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	542 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	543 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	544
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	545 OPFUNC(pseudo_ifeq)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	546 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	547 int v1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	548 int rval;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	549
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	550 if (as -> skipcond && !(as -> skipmacro))
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	551 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	552 as -> skipcount++;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	553 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	554 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	555
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	556 rval = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v1, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	557 if (rval != 0)
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	558 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	559 if (v1)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	560 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	561 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	562 as -> skipcount = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	563 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	564 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	565
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	566 OPFUNC(pseudo_iflt)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	567 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	568 int v1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	569 int rval;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	570
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	571 if (as -> skipcond && !(as -> skipmacro))
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	572 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	573 as -> skipcount++;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	574 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	575 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	576
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	577 rval = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v1, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	578 if (rval != 0)
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	579 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	580 if (v1 >= 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	581 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	582 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	583 as -> skipcount = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	584 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	585 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	586
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	587 OPFUNC(pseudo_ifle)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	588 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	589 int v1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	590 int rval;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	591
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	592 if (as -> skipcond && !(as -> skipmacro))
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	593 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	594 as -> skipcount++;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	595 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	596 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	597
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	598 rval = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v1, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	599 if (rval != 0)
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	600 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	601 if (v1 > 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	602 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	603 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	604 as -> skipcount = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	605 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	606 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	607
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	608 OPFUNC(pseudo_ifgt)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	609 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	610 int v1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	611 int rval;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	612
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	613 if (as -> skipcond && !(as -> skipmacro))
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	614 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	615 as -> skipcount++;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	616 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	617 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	618
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	619 rval = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v1, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	620 if (rval != 0)
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	621 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	622 if (v1 <= 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	623 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	624 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	625 as -> skipcount = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	626 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	627 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	628
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	629 OPFUNC(pseudo_ifge)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	630 {
57495da01900 Initial checking of LWASM lost parents: diff changeset	631 int v1;
57495da01900 Initial checking of LWASM lost parents: diff changeset	632 int rval;
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	633
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	634 if (as -> skipcond && !(as -> skipmacro))
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	635 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	636 as -> skipcount++;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	637 return;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	638 }
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	639
79 d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	640 rval = lwasm_expr_result2(as, l, p, EXPR_PASS1CONST, &v1, 0);
d0ce3f5f6797 Checkpointing deployment of non-constant expression handling lost parents: 78 diff changeset	641 if (rval != 0)
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	642 return;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	643 if (v1 < 0)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	644 {
57 035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	645 as -> skipcond = 1;
035b95a3690f Added conditional assembly and macros lost parents: 56 diff changeset	646 as -> skipcount = 1;
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	647 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	648 }
57495da01900 Initial checking of LWASM lost parents: diff changeset	649
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	650 OPFUNC(pseudo_error)
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	651 {
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	652 register_error(as, l, 1, "User error: %s", *p);
0 57495da01900 Initial checking of LWASM lost parents: diff changeset	653 }
56 55260a178667 Added from f* pseudo ops lost parents: 54 diff changeset	654
74 c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	655
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	656 OPFUNC(pseudo_section)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	657 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	658 sectiontab_t *s;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	659 char *p2;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	660 char *sn;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	661 char *opts;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	662
99 3dcb12a6f4ff Fixed problem handling sections with options on pass 2 lost parents: 95 diff changeset	663
74 c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	664 if (as -> outformat != OUTPUT_OBJ)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	665 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	666 register_error(as, l, 1, "Sections only supported for obj target");
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	667 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	668 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	669
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	670 if (as -> csect)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	671 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	672 as -> csect -> offset = as -> addr;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	673 as -> csect = NULL;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	674 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	675
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	676 if (!**p)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	677 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	678 register_error(as, l, 1, "Need section name");
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	679 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	680 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	681
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	682 for (p2 = p; p2 && !isspace(*p2); p2++)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	683 /* do nothing */ ;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	684
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	685 sn = lwasm_alloc(p2 - *p + 1);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	686 memcpy(sn, p, p2 - p);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	687 sn[p2 - *p] = '\0';
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	688
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	689 *p = p2;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	690
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	691 opts = strchr(sn, ',');
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	692 if (opts)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	693 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	694 *opts++ = '\0';
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	695 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	696
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	697 // have we seen the section name already?
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	698 for (s = as -> sections; s; s = s -> next)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	699 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	700 if (!strcmp(s -> name, sn))
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	701 break;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	702 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	703
99 3dcb12a6f4ff Fixed problem handling sections with options on pass 2 lost parents: 95 diff changeset	704 if (s && as -> passnum == 1)
74 c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	705 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	706 lwasm_free(sn);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	707 if (opts)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	708 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	709 register_error(as, l, 1, "Section options can only be specified the first time");
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	710 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	711 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	712 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	713 else if (!s)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	714 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	715 s = lwasm_alloc(sizeof(sectiontab_t));
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	716 s -> name = sn;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	717 s -> offset = 0;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	718 s -> flags = 0;
85 918be0c02239 Started adding object target output lost parents: 82 diff changeset	719 s -> obytes = NULL;
918be0c02239 Started adding object target output lost parents: 82 diff changeset	720 s -> oblen = 0;
918be0c02239 Started adding object target output lost parents: 82 diff changeset	721 s -> obsize = 0;
86 033a328a10ae Checkpoint: object target output lost parents: 85 diff changeset	722 s -> rl = NULL;
90 6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	723 s -> exports = NULL;
74 c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	724 // parse options; only one "bss"
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	725 if (opts && as -> passnum == 1)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	726 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	727 if (!strcasecmp(opts, "bss"))
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	728 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	729 s -> flags = SECTION_BSS;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	730 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	731 else
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	732 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	733 register_error(as, l, 1, "Unrecognized section option '%s'", opts);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	734 lwasm_free(s -> name);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	735 lwasm_free(s);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	736 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	737 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	738 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	739
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	740 s -> next = as -> sections;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	741 as -> sections = s;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	742 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	743 as -> addr = s -> offset;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	744 as -> csect = s;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	745 as -> context = lwasm_next_context(as);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	746 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	747
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	748 OPFUNC(pseudo_endsection)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	749 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	750 if (as -> outformat != OUTPUT_OBJ)
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	751 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	752 register_error(as, l, 1, "Sections only supported for obj target");
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	753 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	754 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	755
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	756 if (!(as -> csect))
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	757 {
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	758 register_error(as, l, 1, "ENDSECTION when not in a section");
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	759 return;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	760 }
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	761
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	762 as -> csect -> offset = as -> addr;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	763 as -> addr = 0;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	764 as -> csect = 0;
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	765 as -> context = lwasm_next_context(as);
c8c772ef5df9 Checkpointing object target implementation lost parents: 65 diff changeset	766 }
82 03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	767
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	768 OPFUNC(pseudo_extern)
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	769 {
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	770 if (as -> passnum != 1)
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	771 return;
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	772
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	773 if (as -> outformat != OUTPUT_OBJ)
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	774 {
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	775 register_error(as, l, 1, "External references only supported for obj target");
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	776 return;
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	777 }
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	778
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	779 if (as -> csect)
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	780 {
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	781 register_error(as, l, 1, "Cannot declare external symbols within a section");
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	782 return;
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	783 }
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	784
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	785 lwasm_register_symbol(as, l, l -> sym, 0, SYMBOL_EXTERN);
03be43ae19cf Added EXTERN directive lost parents: 79 diff changeset	786 }
90 6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	787
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	788 OPFUNC(pseudo_export)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	789 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	790 lwasm_symbol_ent_t *se;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	791 export_list_t *ex;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	792
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	793 if (as -> outformat != OUTPUT_OBJ)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	794 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	795 register_error(as, l, 1, "Symbol exports only supported for obj target");
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	796 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	797 }
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	798
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	799 if (as -> passnum == 1)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	800 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	801
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	802 // the symbol better be defined at this point (pass 2)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	803 // local symbols cannot be exported nor can "global" symbols
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	804 se = lwasm_find_symbol(as, l -> sym, -1);
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	805 if (!se)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	806 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	807 register_error(as, l, 2, "Exported symbols must be fully defined within a section");
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	808 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	809 }
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	810 if (se -> sect == NULL)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	811 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	812 register_error(as, l, 2, "Only non-local symbols within a section can be exported");
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	813 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	814 }
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	815
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	816 if (se -> flags & SYMBOL_SET)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	817 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	818 register_error(as, l, 2, "You cannot export symbols defined with SET");
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	819 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	820 }
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	821
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	822 // if the symbol is not already a simple value, re-evaluate it
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	823 // and see if it becomes simple
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	824
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	825
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	826 if (se -> flags & SYMBOL_COMPLEX)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	827 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	828 register_error(as, l, 2, "Exported symbols must be fully resolved on pass 2");
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	829 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	830 }
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	831
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	832 // search for existing export
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	833 for (ex = se -> sect -> exports; ex; ex = ex -> next)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	834 if (!strcmp(l -> sym, ex -> sym))
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	835 break;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	836 if (ex)
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	837 {
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	838 register_error(as, l, 2, "Symbol %s already exported", l -> sym);
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	839 return;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	840 }
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	841
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	842 // add an external reference
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	843 ex = lwasm_alloc(sizeof(export_list_t));
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	844 ex -> next = se -> sect -> exports;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	845 se -> sect -> exports = ex;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	846 ex -> offset = se -> value;
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	847 ex -> sym = lwasm_strdup(se -> sym);
6097cb1486f8 Added EXPORT pseudo op lost parents: 86 diff changeset	848 }

Mercurial > hg-old > index.cgi

annotate src/pseudo.c @ 99:3dcb12a6f4ff