diff options
| author | Mike Pall <mike> | 2016-10-02 14:25:04 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-10-02 14:25:04 +0200 |
| commit | f27b2509e0a88d4ec1e1a7b705b259d6daf4640d (patch) | |
| tree | bdbef3d05c7c4aaa59600ace9f101a1b03dacf38 /src | |
| parent | 4ca39095470ac12fe893662b2dca887c278f0682 (diff) | |
| parent | fcc824489914bd4f23c3a49ff9f32fb23cd53c48 (diff) | |
| download | luajit-f27b2509e0a88d4ec1e1a7b705b259d6daf4640d.tar.gz luajit-f27b2509e0a88d4ec1e1a7b705b259d6daf4640d.tar.bz2 luajit-f27b2509e0a88d4ec1e1a7b705b259d6daf4640d.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/lj_emit_arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_emit_arm.h b/src/lj_emit_arm.h index dff9fac4..496b37a3 100644 --- a/src/lj_emit_arm.h +++ b/src/lj_emit_arm.h | |||
| @@ -274,7 +274,7 @@ static void emit_call(ASMState *as, void *target) | |||
| 274 | ptrdiff_t delta = ((char *)target - (char *)p) - 8; | 274 | ptrdiff_t delta = ((char *)target - (char *)p) - 8; |
| 275 | if ((((delta>>2) + 0x00800000) >> 24) == 0) { | 275 | if ((((delta>>2) + 0x00800000) >> 24) == 0) { |
| 276 | if ((delta & 1)) | 276 | if ((delta & 1)) |
| 277 | *p = ARMI_BLX | ((uint32_t)(delta>>2) & 0x00ffffffu) | ((delta&2) << 27); | 277 | *p = ARMI_BLX | ((uint32_t)(delta>>2) & 0x00ffffffu) | ((delta&2) << 23); |
| 278 | else | 278 | else |
| 279 | *p = ARMI_BL | ((uint32_t)(delta>>2) & 0x00ffffffu); | 279 | *p = ARMI_BL | ((uint32_t)(delta>>2) & 0x00ffffffu); |
| 280 | } else { /* Target out of range: need indirect call. But don't use R0-R3. */ | 280 | } else { /* Target out of range: need indirect call. But don't use R0-R3. */ |