diff options
| author | Mike Pall <mike> | 2021-06-08 22:35:23 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2021-06-08 22:35:23 +0200 |
| commit | c1c4c5599cb32dd9a39af55f9dc953f8e1bf9ddc (patch) | |
| tree | c30de2ba112cab0d04908c343bbe6b8ac489e52c | |
| parent | 3fbf51bb99e3795497c010e286cb749094da6bc2 (diff) | |
| parent | 98f95f69180d48ce49289d6428b46a9ccdd67a46 (diff) | |
| download | luajit-c1c4c5599cb32dd9a39af55f9dc953f8e1bf9ddc.tar.gz luajit-c1c4c5599cb32dd9a39af55f9dc953f8e1bf9ddc.tar.bz2 luajit-c1c4c5599cb32dd9a39af55f9dc953f8e1bf9ddc.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | dynasm/dasm_x86.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua index 50f563ba..fe2cf579 100644 --- a/dynasm/dasm_x86.lua +++ b/dynasm/dasm_x86.lua | |||
| @@ -832,7 +832,7 @@ local function parseoperand(param, isqword) | |||
| 832 | if t.disp then break end | 832 | if t.disp then break end |
| 833 | 833 | ||
| 834 | -- [reg+xreg...] | 834 | -- [reg+xreg...] |
| 835 | local xreg, tailx = match(tailr, "^+%s*([@%w_:]+)%s*(.*)$") | 835 | local xreg, tailx = match(tailr, "^%+%s*([@%w_:]+)%s*(.*)$") |
| 836 | xreg, t.xreg, tp = rtexpr(xreg) | 836 | xreg, t.xreg, tp = rtexpr(xreg) |
| 837 | if not t.xreg then | 837 | if not t.xreg then |
| 838 | -- [reg+-expr] | 838 | -- [reg+-expr] |