aboutsummaryrefslogtreecommitdiff
path: root/dynasm
diff options
context:
space:
mode:
authorMike Pall <mike>2017-09-20 19:42:34 +0200
committerMike Pall <mike>2017-09-20 19:42:34 +0200
commit6a2d8b0b4d49eb5aac600c219e5903420806e56e (patch)
tree5aacf053c97c277b7aabfacc1a3fa2252db0b6b6 /dynasm
parentbf12f1dafb157008b963f829b57b2472b6993cc8 (diff)
parent0c0e7b168ea147866835954267c151ef789f64fb (diff)
downloadluajit-6a2d8b0b4d49eb5aac600c219e5903420806e56e.tar.gz
luajit-6a2d8b0b4d49eb5aac600c219e5903420806e56e.tar.bz2
luajit-6a2d8b0b4d49eb5aac600c219e5903420806e56e.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
-rw-r--r--dynasm/dasm_x86.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h
index bc636357..f598da9a 100644
--- a/dynasm/dasm_x86.h
+++ b/dynasm/dasm_x86.h
@@ -421,7 +421,8 @@ int dasm_encode(Dst_DECL, void *buffer)
421 } 421 }
422 case DASM_REL_LG: p++; if (n >= 0) goto rel_pc; 422 case DASM_REL_LG: p++; if (n >= 0) goto rel_pc;
423 b++; n = (int)(ptrdiff_t)D->globals[-n]; 423 b++; n = (int)(ptrdiff_t)D->globals[-n];
424 case DASM_REL_A: rel_a: n -= (int)(ptrdiff_t)(cp+4); goto wd; /* !x64 */ 424 case DASM_REL_A: rel_a:
425 n -= (unsigned int)(ptrdiff_t)(cp+4); goto wd; /* !x64 */
425 case DASM_REL_PC: rel_pc: { 426 case DASM_REL_PC: rel_pc: {
426 int shrink = *b++; 427 int shrink = *b++;
427 int *pb = DASM_POS2PTR(D, n); if (*pb < 0) { n = pb[1]; goto rel_a; } 428 int *pb = DASM_POS2PTR(D, n); if (*pb < 0) { n = pb[1]; goto rel_a; }