diff options
author | Mike Pall <mike> | 2014-01-19 13:12:23 +0100 |
---|---|---|
committer | Mike Pall <mike> | 2014-01-19 13:12:23 +0100 |
commit | 4e78b9bb126a3c4a3d27770664452039419d339b (patch) | |
tree | 4f0243e7921a83cda91f4617f155474c7d6aa637 /src/vm_x86.dasc | |
parent | a9d454360161d80310753dafa0d945eea4d98fde (diff) | |
parent | 926686ad3ddb51e4c74294854946b085ac50373b (diff) | |
download | luajit-4e78b9bb126a3c4a3d27770664452039419d339b.tar.gz luajit-4e78b9bb126a3c4a3d27770664452039419d339b.tar.bz2 luajit-4e78b9bb126a3c4a3d27770664452039419d339b.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/vm_x86.dasc')
-rw-r--r-- | src/vm_x86.dasc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm_x86.dasc b/src/vm_x86.dasc index bae85bdf..bbe341ff 100644 --- a/src/vm_x86.dasc +++ b/src/vm_x86.dasc | |||
@@ -5950,12 +5950,12 @@ static void emit_asm_debug(BuildCtx *ctx) | |||
5950 | #if LJ_64 | 5950 | #if LJ_64 |
5951 | "\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */ | 5951 | "\t.byte 0xe\n\t.byte 16\n" /* def_cfa_offset */ |
5952 | "\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */ | 5952 | "\t.byte 0x86\n\t.byte 0x2\n" /* offset rbp */ |
5953 | "\t.byte 0xd\n\t.uleb128 0x6\n" /* def_cfa_register rbp */ | 5953 | "\t.byte 0xd\n\t.byte 0x6\n" /* def_cfa_register rbp */ |
5954 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */ | 5954 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset rbx */ |
5955 | #else | 5955 | #else |
5956 | "\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */ | 5956 | "\t.byte 0xe\n\t.byte 8\n" /* def_cfa_offset */ |
5957 | "\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/ | 5957 | "\t.byte 0x84\n\t.byte 0x2\n" /* offset ebp (4 for MACH-O)*/ |
5958 | "\t.byte 0xd\n\t.uleb128 0x4\n" /* def_cfa_register ebp */ | 5958 | "\t.byte 0xd\n\t.byte 0x4\n" /* def_cfa_register ebp */ |
5959 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */ | 5959 | "\t.byte 0x83\n\t.byte 0x3\n" /* offset ebx */ |
5960 | #endif | 5960 | #endif |
5961 | "\t.align " BSZPTR "\n" | 5961 | "\t.align " BSZPTR "\n" |