diff options
| author | Mike Pall <mike> | 2013-07-09 17:30:36 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-07-09 17:30:36 +0200 |
| commit | 146807b7e82a8a5b9999928c4a767f1d0db11b82 (patch) | |
| tree | 8146118cba06f4663752008973a5c9ec3c07de74 /dynasm | |
| parent | 88188d52f763aa8bb686003bd459d8b605998850 (diff) | |
| parent | 519ef0cba7ebceb99e727da9655692d137854188 (diff) | |
| download | luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.tar.gz luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.tar.bz2 luajit-146807b7e82a8a5b9999928c4a767f1d0db11b82.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
| -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 1f0981f3..07ddd98d 100644 --- a/dynasm/dasm_x86.lua +++ b/dynasm/dasm_x86.lua | |||
| @@ -1040,7 +1040,7 @@ local map_op = { | |||
| 1040 | -- ED: *in Rdw,dx | 1040 | -- ED: *in Rdw,dx |
| 1041 | -- EE: *out dx,Rb | 1041 | -- EE: *out dx,Rb |
| 1042 | -- EF: *out dx,Rdw | 1042 | -- EF: *out dx,Rdw |
| 1043 | -- F0: *lock | 1043 | lock_0 = "F0", |
| 1044 | int1_0 = "F1", | 1044 | int1_0 = "F1", |
| 1045 | repne_0 = "F2", | 1045 | repne_0 = "F2", |
| 1046 | repnz_0 = "F2", | 1046 | repnz_0 = "F2", |