diff options
| author | Kartik Agaram <vc@akkartik.com> | 2019-05-13 22:34:31 -0700 |
|---|---|---|
| committer | Kartik Agaram <vc@akkartik.com> | 2019-05-13 22:57:14 -0700 |
| commit | 56a0f3c560b9763c1aafdf7898d134b57277ff5e (patch) | |
| tree | 3156b6bf3e48737f9a79e81112e7a24268c93d5d /subx/060read.subx | |
| parent | c12e85e1038f1118da0e22a810801b402a67a444 (diff) | |
| parent | 3cf8a4548fd31d4e6f221bbcc643b365264a649c (diff) | |
| download | mu-56a0f3c560b9763c1aafdf7898d134b57277ff5e.tar.gz | |
Merge branch 'dquotes' into dquotes-1
dquotes.subx is now segfaulting after this merge. Seems to be trying to use addresses from the old stack.
Diffstat (limited to 'subx/060read.subx')
| -rw-r--r-- | subx/060read.subx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subx/060read.subx b/subx/060read.subx index cedafbf5..d377a1ad 100644 --- a/subx/060read.subx +++ b/subx/060read.subx @@ -51,7 +51,7 @@ read: # f : fd or (address stream), s : (address stream) -> num-bytes-read/EAX 89/copy 3/mod/direct 5/rm32/EBP . . . 4/r32/ESP . . # copy ESP to EBP # if (f < 0x08000000) return _read(f, s) # f can't be a user-mode address, so treat it as a kernel file descriptor 81 7/subop/compare 1/mod/*+disp8 5/rm32/EBP . . . . 8/disp8 0x08000000/imm32 # compare *(EBP+8) - 7d/jump-if-greater-or-equal $read:fake/disp8 + 73/jump-if-greater-unsigned-or-equal $read:fake/disp8 # . . push args ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 0xc/disp8 . # push *(EBP+12) ff 6/subop/push 1/mod/*+disp8 5/rm32/EBP . . . . 8/disp8 . # push *(EBP+8) |