From 554bd0996872ffcadf808229cc38e445d6016dae Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Thu, 11 Jul 2019 21:38:25 -0700 Subject: label offset computation still has a bug I changed the test a little to make it obvious. Basically there's no way we can compute the segment offset correctly without knowing the segment name in the previous assertion. --- subx/apps/survey.subx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/subx/apps/survey.subx b/subx/apps/survey.subx index abdd6939..0cedd7bc 100644 --- a/subx/apps/survey.subx +++ b/subx/apps/survey.subx @@ -671,6 +671,7 @@ test-compute-offsets: # == code 0x1 # ab x/imm32 # == data 0x1000 + # 00 # x: # 34 # @@ -679,8 +680,8 @@ test-compute-offsets: # segment 'code' has size 0x5 # segment 'data' is at file offset 0x5 # label 'x' is in segment 'data' - # label 'x' is at segment offset 0x0 - # segment 'data' has size 0x1 + # label 'x' is at segment offset 0x1 + # segment 'data' has size 0x2 # # . prolog 55/push-EBP @@ -805,10 +806,10 @@ test-compute-offsets: e8/call check-trace-contains/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP - # . check-trace-contains("segment 'data' has size 0x00000001.", msg) + # . check-trace-contains("segment 'data' has size 0x00000002.", msg) # . . push args 68/push "F - test-compute-offsets/3"/imm32 - 68/push "segment 'data' has size 0x00000001."/imm32 + 68/push "segment 'data' has size 0x00000002."/imm32 # . . call e8/call check-trace-contains/disp32 # . . discard args @@ -821,10 +822,10 @@ test-compute-offsets: e8/call check-trace-contains/disp32 # . . discard args 81 0/subop/add 3/mod/direct 4/rm32/ESP . . . . . 8/imm32 # add to ESP - # . check-trace-contains("label 'x' is at segment offset 0x00000000.", msg) + # . check-trace-contains("label 'x' is at segment offset 0x00000001.", msg) # . . push args 68/push "F - test-compute-offsets/5"/imm32 - 68/push "label 'x' is at segment offset 0x00000000."/imm32 + 68/push "label 'x' is at segment offset 0x00000001."/imm32 # . . call e8/call check-trace-contains/disp32 # . . discard args -- cgit 1.4.1-2-gfad0 7'>root/020run.cc
blob: d9d7033440836e4fd5a943e3bcd92bf9e369032f (plain) (tree) 
8c9e97ae ^

2199940a ^

9a81d746 ^

8a92ada8 ^


2199940a ^

9a81d746 ^

2199940a ^







9fc64bbc ^

1ead3562 ^

192d59d3 ^

9fc64bbc ^

acc4792d ^

57699011 ^

9fc64bbc ^

a26cc359 ^

1ead3562 ^

192d59d3 ^


a26cc359 ^

acc4792d ^

a26cc359 ^

57699011 ^

a26cc359 ^

0487a30e ^

1ead3562 ^

192d59d3 ^

0487a30e ^

0487a30e ^



6f5d7864 ^

ec926027 ^

b0bf5321 ^

1228ec73 ^

363be37f ^

b24eb476 ^

363be37f ^

69e14325 ^

95b2a140 ^

1228ec73 ^


7da71d03 ^

0edf822f ^

b24eb476 ^



07b54625 ^


7da71d03 ^

9fc64bbc ^

d8509b41 ^

b75e94b3 ^



07b54625 ^

9fc64bbc ^


b3899909 ^

49620728 ^

a7d70735 ^

e317da73 ^

6c96a437 ^

9f95c745 ^

795f5244 ^

1b76245c ^

795f5244 ^

35064671 ^

dc269891 ^

fca0ebbe ^

e74a2940 ^

6c96a437 ^

e74a2940 ^

0487a30e ^

dc269891 ^

fca0ebbe ^

dcfca05e ^

f1a6f323 ^

d241c9c4 ^

827898fc ^

d241c9c4 ^


f1a6f323 ^

d241c9c4 ^

dcfca05e ^

d241c9c4 ^

9cf71627 ^

f404eb55 ^


cfb142b9 ^

b8263692 ^

cfb142b9 ^


6c96a437 ^

1cd2691b ^

0487a30e ^

f404eb55 ^

3eb81335 ^

0d302187 ^

1066660e ^

9fc64bbc ^

9d670bb5 ^

9fc64bbc ^

f404eb55 ^


9fc64bbc ^

6a7ff61c ^

49620728 ^

ccba6718 ^





e74a2940 ^





3c435756 ^

49620728 ^

2199940a ^

49620728 ^

d41955c1 ^

8eff7919 ^

ec926027 ^


49620728 ^

d41955c1 ^

795f5244 ^

ec926027 ^


49620728 ^

58a08ed3 ^




49620728 ^

d41955c1 ^

795f5244 ^

dcfca05e ^


49620728 ^

d41955c1 ^

795f5244 ^

ec926027 ^


49620728 ^

d41955c1 ^

95b2a140 ^



e5e9f7db ^




9a81d746 ^

f28f2636 ^

785a60fa ^

2429c65c ^

8aa4b664 ^


e5e9f7db ^


b39ceb27 ^

2186422c ^

db50f43a ^

07c594eb ^

e7f76736 ^

cea49fde ^

7fd01071 ^


cea49fde ^

6d6c37fe ^

cea49fde ^

6d6c37fe ^


2429c65c ^

60e11efc ^


e7f76736 ^

ae5f0b6f ^

b39ceb27 ^

2429c65c ^

6dd67576 ^


4cec4143 ^

2429c65c ^

e7f76736 ^

e5e9f7db ^


b39ceb27 ^

ae5f0b6f ^

0d3f30c2 ^

b39ceb27 ^

6f69d5d9 ^





7858a06a ^

cea49fde ^



cea49fde ^


ae5f0b6f ^

e7f76736 ^

e7f76736 ^


026efa57 ^



838b1afc ^

026efa57 ^


838b1afc ^

026efa57 ^


267ebb59 ^

e0551d78 ^

6c96a437 ^

e0551d78 ^


c062021a ^

6c96a437 ^

c062021a ^



6c96a437 ^

c062021a ^


e0551d78 ^

e5e9f7db ^


e0551d78 ^


f78f92c5 ^

f28f2636 ^

e777ce0c ^

215cf3c2 ^

f78f92c5 ^



2c0583aa ^

f78f92c5 ^





2429c65c ^

9f78ec2d ^

2429c65c ^

9f78ec2d ^


267ebb59 ^

f5f4b698 ^

5ea70e95 ^

f5f4b698 ^


b2ec0969 ^

8c9e97ae ^

267ebb59 ^



9f78ec2d ^






2429c65c ^

9f78ec2d ^


6c96a437 ^

9f78ec2d ^

55fc43b7 ^

2429c65c ^

9f78ec2d ^






385ff136 ^


9f78ec2d ^

7284d503 ^


e5e9f7db ^

3473c63a ^

43b866d1 ^

fca0ebbe ^

ab6ed192 ^

a4ef18b1 ^

a26cc359 ^


43b866d1 ^

b24eb476 ^

6c96a437 ^

6700f9f2 ^


b291f85b ^


cae5461b ^



1cd2691b ^


43b866d1 ^

0c0bc3ae ^

9dcbec39 ^

0c0bc3ae ^


6b6dfb0c ^

18429d40 ^

43b866d1 ^

4588af97 ^

b8263692 ^

4588af97 ^


70179d1f ^

b8263692 ^

35064671 ^

70179d1f ^

43b866d1 ^

6c96a437 ^

6700f9f2 ^



b291f85b ^

cae5461b ^


c1a50c82 ^

b24eb476 ^

3c163ef7 ^

1211a3ab ^

c6034af3 ^

3076bab4 ^

b24eb476 ^

3c163ef7 ^

f4647409 ^






4ecab182 ^




b771d375 ^

f4647409 ^


1211a3ab ^

f48f6c14 ^

eaa75c87 ^

decaddb4 ^

70179d1f ^

3c163ef7 ^

1211a3ab ^

6c1376f8 ^

70179d1f ^



d41955c1 ^

af023b32 ^






a0fc38c9 ^


d41955c1 ^

78164bab ^


d41955c1 ^

78164bab ^



e5e9f7db ^

19695cc7 ^

e5e9f7db ^



4cec4143 ^

390f4097 ^






e5e9f7db ^


decaddb4 ^

1ead3562 ^

decaddb4 ^

192d59d3 ^


decaddb4 ^

acc4792d ^


d7494165 ^

fc55fea0 ^


1ead3562 ^

bc643692 ^

fc55fea0 ^

acc4792d ^

18429d40 ^

bc643692 ^

5f98a10c ^

1ead3562 ^

192d59d3 ^

18429d40 ^

bc643692 ^

6d2b1168 ^

9a81d746 ^

677fa104 ^



1ead3562 ^

192d59d3 ^

677fa104 ^

578327f1 ^

677fa104 ^


1ead3562 ^

192d59d3 ^

677fa104 ^

578327f1 ^

677fa104 ^


1ead3562 ^

192d59d3 ^

677fa104 ^

578327f1 ^

677fa104 ^


1ead3562 ^

192d59d3 ^

677fa104 ^

578327f1 ^

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

181
182

183

184
185

186

187

188

189

190
191

192

193

194

195
196

197

198

199

200

201
202
203
204
205

206

207
208
209

210
211

212

213

214
215

216
217
218

219

220
221

222

223
224

225

226

227

228
229

230

231

232
233
234

235

236
237

238

239
240

241
242

243

244

245

246

247
248
249

250

251
252
253
254
255

256

257

258

259
260

261

262

263

264
265

266

267

268
269
270

271
272
273
274
275
276

277

278
279

280

281

282

283

284
285
286
287
288
289

290
291

292

293
294

295

296

297

298

299

300

301
302

303

304

305

306
307

308
309

310
311
312

313
314

315

316

317

318
319

320

321

322

323

324

325
326

327

328

329

330

331

332

333
334
335

336

337
338

339

340

341

342

343

344

345

346

347
348
349
350
351
352

353
354
355
356

357

358
359

360

361

362

363

364

365

366

367

368
369
370

371

372
373
374
375
376
377

378
379

380

381
382

383

384
385
386

387

388

389
390
391

392

393
394
395
396
397
398

399
400

401

402

403

404
405

406

407
408

409

410
411

412

413

414

415

416

417

418

419

420

421

422

423

424

425
426
427

428

429

430

431

432
433

434

435

436

437

438
439

440

441

442

443

444
445

446

447

448

449