Mercurial > hg > index.cgi

annotate lwasm/struct.c @ 129:5706712f8a20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow [>...] for extended indirect
author lost@l-w.ca
date Thu, 11 Aug 2011 22:25:29 -0600
parents ccaecdff3fc2
children 211fc8038b8d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
1 /*
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
2 struct.c
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
3 Copyright © 2010 William Astle
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
4
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
5 This file is part of LWASM.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
6
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
7 LWASM is free software: you can redistribute it and/or modify it under the
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
8 terms of the GNU General Public License as published by the Free Software
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
9 Foundation, either version 3 of the License, or (at your option) any later
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
10 version.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
11
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
12 This program is distributed in the hope that it will be useful, but WITHOUT
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
15 more details.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
16
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
17 You should have received a copy of the GNU General Public License along with
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
18 this program. If not, see <http://www.gnu.org/licenses/>.
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
19
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
20 Contains stuff associated with structure processing
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
21 */
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
22
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
23 #include <string.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
24
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
25 #include <lw_alloc.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
26 #include <lw_string.h>
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
27
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
28 #include "lwasm.h"
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
29 #include "instab.h"
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
30
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
31 PARSEFUNC(pseudo_parse_struct)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
32 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
33 structtab_t *s;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
34
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
35 if (as -> instruct)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
36 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
37 lwasm_register_error(as, l, "Attempt to define a structure inside a structure");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
38 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
39 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
40
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
41 if (l -> sym == NULL)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
42 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
43 lwasm_register_error(as, l, "Structure definition with no effect - no symbol");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
44 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
45 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
46
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
47 for (s = as -> structs; s; s = s -> next)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
48 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
49 if (!strcmp(s -> name, l -> sym))
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
50 break;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
51 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
52
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
53 if (s)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
54 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
55 lwasm_register_error(as, l, "Duplicate structure definition");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
56 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
57 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
58
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
59 as -> instruct = 1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
60
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
61 s = lw_alloc(sizeof(structtab_t));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
62 s -> name = lw_strdup(l -> sym);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
63 s -> next = as -> structs;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
64 s -> fields = NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
65 s -> size = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
66 as -> structs = s;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
67 as -> cstruct = s;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
68
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
69 skip_operand(p);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
70
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
71 l -> len = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
72 l -> symset = 1;
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
73
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
74 // save current assembly address and initialize to 0
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
75 as -> savedaddr = l -> addr;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
76 l -> addr = lw_expr_build(lw_expr_type_int, 0);
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
77 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
78
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
79 static void instantiate_struct(asmstate_t *as, line_t *l, structtab_t *s, char *pref, lw_expr_t baseaddr)
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
80 {
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
81 int len;
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
82 char *t;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
83 int plen;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
84 int addr = 0;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
85 lw_expr_t te, te2;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
86 structtab_field_t *e;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
87
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
88 if (baseaddr == NULL)
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
89 baseaddr = l -> addr;
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
90
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
91 plen = strlen(pref);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
92 for (e = s -> fields; e; e = e -> next)
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
93 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
94 if (e -> name)
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
95 {
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
96 len = plen + strlen(e -> name) + 1;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
97 t = lw_alloc(len + 1);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
98 sprintf(t, "%s.%s", pref, e -> name);
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
99 }
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
100 else
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
101 {
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
102 len = plen + 30;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
103 t = lw_alloc(len + 1);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
104 sprintf(t, "%s.____%d", pref, addr);
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
105 }
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
106
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
107 te = lw_expr_build(lw_expr_type_int, addr);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
108 te2 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_plus, te, baseaddr);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
109 register_symbol(as, l, t, te2, symbol_flag_nocheck);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
110 lw_expr_destroy(te);
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
111
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
112 if (e -> substruct)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
113 {
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
114 instantiate_struct(as, l, e -> substruct, t, te2);
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
115 }
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
116
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
117 lw_expr_destroy(te2);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
118
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
119 lw_free(t);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
120 addr += e -> size;
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
121 }
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
122
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
123 /* register the "sizeof" symbol */
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
124 len = plen + 8;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
125 t = lw_alloc(len + 1);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
126 sprintf(t, "sizeof{%s}", pref);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
127 te = lw_expr_build(lw_expr_type_int, s -> size);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
128 register_symbol(as, l, t, te, symbol_flag_nocheck);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
129 lw_expr_destroy(te);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
130 lw_free(t);
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
131 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
132
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
133
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
134 PARSEFUNC(pseudo_parse_endstruct)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
135 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
136 lw_expr_t te;
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
137
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
138 if (as -> instruct == 0)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
139 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
140 lwasm_register_warning(as, l, "endstruct without struct");
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
141 skip_operand(p);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
142 return;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
143 }
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
144
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
145 te = lw_expr_build(lw_expr_type_int, 0);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
146
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
147 // make all the relevant generic struct symbols
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
148 instantiate_struct(as, l, as -> cstruct, as -> cstruct -> name, te);
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
149 lw_expr_destroy(te);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
150
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
151 l -> soff = as -> cstruct -> size;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
152 as -> instruct = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
153
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
154 skip_operand(p);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
155
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
156 lw_expr_destroy(l -> addr);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
157 l -> addr = as -> savedaddr;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
158 as -> savedaddr = NULL;
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
159
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
160 l -> len = 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
161 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
162
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
163 void register_struct_entry(asmstate_t *as, line_t *l, int size, structtab_t *ss)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
164 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
165 structtab_field_t *e, *e2;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
166
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
167 l -> soff = as -> cstruct -> size;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
168 e = lw_alloc(sizeof(structtab_field_t));
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
169 e -> next = NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
170 e -> size = size;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
171 if (l -> sym)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
172 e -> name = lw_strdup(l -> sym);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
173 else
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
174 e -> name = NULL;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
175 e -> substruct = ss;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
176 if (as -> cstruct -> fields)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
177 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
178 for (e2 = as -> cstruct -> fields; e2 -> next; e2 = e2 -> next)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
179 /* do nothing */ ;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
180 e2 -> next = e;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
181 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
182 else
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
183 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
184 as -> cstruct -> fields = e;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
185 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
186 as -> cstruct -> size += size;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
187 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
188
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
189 int expand_struct(asmstate_t *as, line_t *l, char **p, char *opc)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
190 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
191 structtab_t *s;
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
192
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
193 debug_message(as, 200, "Checking for structure expansion: %s", opc);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
194
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
195 for (s = as -> structs; s; s = s -> next)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
196 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
197 if (!strcmp(opc, s -> name))
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
198 break;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
199 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
200
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
201 if (!s)
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
202 return -1;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
203
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
204 debug_message(as, 10, "Expanding structure: %s", opc);
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
205
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
206 if (!(l -> sym))
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
207 {
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
208 lwasm_register_error(as, l, "Cannot declare a structure without a symbol name.");
2
7317fbe024af Clean up insane number of compiler warnings under -Wall
lost@l-w.ca
parents: 0
diff changeset
209 return -1;
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
210 }
47
1d6a31a2586b Fixed multiple symbol error with nested structs
lost@l-w.ca
parents: 46
diff changeset
211
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
212 l -> len = s -> size;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
213
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
214 if (as -> instruct)
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
215 {
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
216 /* register substruct here */
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
217 register_struct_entry(as, l, s -> size, s);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
218 /* mark the symbol consumed */
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
219 l -> symset = 1;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
220 l -> len = 0;
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
221 return 0;
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
222 }
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
223 else
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
224 {
61
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
225 /* instantiate the struct here */
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
226 instantiate_struct(as, l, s, l -> sym, NULL);
ccaecdff3fc2 Make structure definitions not affect current assembly address and fix up cosmetic offset display in listings
lost@l-w.ca
parents: 48
diff changeset
227 return 0;
10
127e5b1e01c0 Removed use of asprintf() and added Makefile options for cross compiling; also a bugfix with sizeof{} in lwasm
lost@l-w.ca
parents: 2
diff changeset
228 }
0
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
229
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
230 return 0;
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
231 }
2c24602be78f Initial import from lwtools 3.0.1 version, with new hand built build system and file reorganization
lost@l-w.ca
parents:
diff changeset
232