about summary refs log tree commit diff stats
path: root/apps
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2019-08-23 11:07:26 -0700
committerKartik Agaram <vc@akkartik.com>2019-08-23 11:07:26 -0700
commit4949dda5540b996e86c9efea619e091df9d095dc (patch)
tree56f9cfd3e08abbba7be996062a791f77c08d514e /apps
parentba5a2eff2c2b4ab1fc5104b6d4f617759b019946 (diff)
downloadmu-4949dda5540b996e86c9efea619e091df9d095dc.tar.gz
.
Diffstat (limited to 'apps')
-rw-r--r--apps/desugar.subx6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/desugar.subx b/apps/desugar.subx
index 01b1abcb..dd8737ee 100644
--- a/apps/desugar.subx
+++ b/apps/desugar.subx
@@ -86,7 +86,7 @@ convert:  # in : (address buffered-file), out : (address buffered-file) -> <void
     #         base, index, scale, disp = parse-effective-address(word-slice)
     #         emit-indirect-mode(out, base, index, scale, disp)
     #       else if slice-starts-with?(word-slice, '+')
-    #         abort("base+disp addressing must be within '()'")
+    #         abort("'+' only permitted within '*(...)'")
     #       else
     #         write-slice-buffered(out, word-slice)
     #       write(out, " ")
@@ -960,7 +960,7 @@ test-next-word-or-expression-returns-whole-expression:
 # Grammar:
 #   *reg                    -> 0/mod reg/rm32
 #   *(reg)                  -> 0/mod reg/rm32
-#   *(reg+disp)             -> 2/mod reg/rm32
+#   *(reg+disp)             -> 2/mod reg/rm32 disp/disp32
 #   *(reg1+reg2<<s)         -> 2/mod 4/rm32 reg1/base reg2/index s/scale 0/disp32
 #   *(reg1+reg2<<s+disp)    -> 2/mod 4/rm32 reg1/base reg2/index s/scale disp/disp32
 # Intermediate structure: base, index, scale, disp
@@ -974,7 +974,7 @@ parse-effective-address:  # word : (address slice) -> base/EAX, index/ECX, scale
     56/push-ESI
     # ESI = word
     8b/copy                         1/mod/*+disp8   5/rm32/EBP    .           .             .           0/r32/EAX   8/disp8         .                 # copy *(EBP+8) to ESI
-    # ++word->start
+    # skip '*'
     ff          0/subop/increment   0/mod/indirect  0/rm32/EAX    .           .             .           .           .               .                 # increment *ESI
     # initialize defaults
     b8/copy-to-EAX  0/imm32
;vc@akkartik.com> 2016-09-17 10:28:25 -0700 3385' href='/akkartik/mu/commit/062convert_ingredients_to_text.cc?h=main&id=7a84094adbf7570e0b9716d8f469458b901efec8'>7a84094a ^
21fc6180 ^




d57bf669 ^



d63cddea ^
d57bf669 ^
a0331a9b ^
d57bf669 ^

b0bf5321 ^

093b45e7 ^
8e60380e ^
d63cddea ^
8e60380e ^
a0331a9b ^
8e60380e ^



84393683 ^

7a84094a ^
84393683 ^
d63cddea ^
84393683 ^









e9390236 ^
093b45e7 ^

d8509b41 ^
093b45e7 ^
eb45abde ^
093b45e7 ^

eb45abde ^
093b45e7 ^

eb45abde ^
093b45e7 ^
6c96a437 ^
093b45e7 ^
b75d9d45 ^
093b45e7 ^
6c96a437 ^
78c50205 ^
093b45e7 ^
b0bf5321 ^
eb45abde ^
21fc6180 ^


6c96a437 ^
78c50205 ^
21fc6180 ^

eb45abde ^
093b45e7 ^

85553e52 ^
b75d9d45 ^




78c50205 ^
cfa5a9f8 ^
b75d9d45 ^





093b45e7 ^




dad3bedd ^
21fc6180 ^

eb45abde ^
21fc6180 ^
78c50205 ^
21fc6180 ^



3c4c9c08 ^
21fc6180 ^




3c4c9c08 ^
21fc6180 ^








3473c63a ^
af023b32 ^

d57bf669 ^
af023b32 ^
d57bf669 ^

3473c63a ^
8e60380e ^
af023b32 ^
8e60380e ^

514f0e34 ^








b75d9d45 ^



7a84094a ^
377b00b0 ^
864cbf9d ^

d52406cc ^
b75d9d45 ^

dad3bedd ^


dad3bedd ^


7a84094a ^

dad3bedd ^
d63cddea ^
dad3bedd ^




1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180