diff options
| author | Mike Pall <mike> | 2013-03-17 14:20:40 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2013-03-17 14:20:40 +0100 |
| commit | d147eedac963f6dfc757d269c180985fd9c0c1e7 (patch) | |
| tree | 63f3219e6afa13a72b815560ee90f5ce4d8e55f8 /dynasm | |
| parent | eea48c8b263f4fb294200f394764a6eba1de877a (diff) | |
| download | luajit2-d147eedac963f6dfc757d269c180985fd9c0c1e7.tar.gz | |
DynASM: Improve validation of local backwards relocations.
Diffstat (limited to 'dynasm')
| -rw-r--r-- | dynasm/dasm_arm.h | 3 | ||||
| -rw-r--r-- | dynasm/dasm_mips.h | 3 | ||||
| -rw-r--r-- | dynasm/dasm_ppc.h | 3 | ||||
| -rw-r--r-- | dynasm/dasm_x86.h | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/dynasm/dasm_arm.h b/dynasm/dasm_arm.h index 691cfdd7..d83cbbb3 100644 --- a/dynasm/dasm_arm.h +++ b/dynasm/dasm_arm.h @@ -211,7 +211,8 @@ void dasm_put(Dst_DECL, int start, ...) case DASM_ALIGN: ofs += (ins & 255); b[pos++] = ofs; break; case DASM_REL_LG: n = (ins & 2047) - 10; pl = D->lglabels + n; - if (n >= 0) { CKPL(lg, LG); goto putrel; } /* Bkwd rel or global. */ + /* Bkwd rel or global. */ + if (n >= 0) { CK(n>=10||*pl<0, RANGE_LG); CKPL(lg, LG); goto putrel; } pl += 10; n = *pl; if (n < 0) n = 0; /* Start new chain for fwd rel if label exists. */ goto linkrel; diff --git a/dynasm/dasm_mips.h b/dynasm/dasm_mips.h index 77a8eb52..0866beb8 100644 --- a/dynasm/dasm_mips.h +++ b/dynasm/dasm_mips.h @@ -202,7 +202,8 @@ void dasm_put(Dst_DECL, int start, ...) case DASM_ALIGN: ofs += (ins & 255); b[pos++] = ofs; break; case DASM_REL_LG: n = (ins & 2047) - 10; pl = D->lglabels + n; - if (n >= 0) { CKPL(lg, LG); goto putrel; } /* Bkwd rel or global. */ + /* Bkwd rel or global. */ + if (n >= 0) { CK(n>=10||*pl<0, RANGE_LG); CKPL(lg, LG); goto putrel; } pl += 10; n = *pl; if (n < 0) n = 0; /* Start new chain for fwd rel if label exists. */ goto linkrel; diff --git a/dynasm/dasm_ppc.h b/dynasm/dasm_ppc.h index 774ee6ed..13c44611 100644 --- a/dynasm/dasm_ppc.h +++ b/dynasm/dasm_ppc.h @@ -202,7 +202,8 @@ void dasm_put(Dst_DECL, int start, ...) case DASM_ALIGN: ofs += (ins & 255); b[pos++] = ofs; break; case DASM_REL_LG: n = (ins & 2047) - 10; pl = D->lglabels + n; - if (n >= 0) { CKPL(lg, LG); goto putrel; } /* Bkwd rel or global. */ + /* Bkwd rel or global. */ + if (n >= 0) { CK(n>=10||*pl<0, RANGE_LG); CKPL(lg, LG); goto putrel; } pl += 10; n = *pl; if (n < 0) n = 0; /* Start new chain for fwd rel if label exists. */ goto linkrel; diff --git a/dynasm/dasm_x86.h b/dynasm/dasm_x86.h index eb2bc768..c91bfdd5 100644 --- a/dynasm/dasm_x86.h +++ b/dynasm/dasm_x86.h @@ -213,7 +213,8 @@ void dasm_put(Dst_DECL, int start, ...) case DASM_REL_LG: case DASM_IMM_LG: n = *p++; pl = D->lglabels + n; - if (n <= 246) { CKPL(lg, LG); goto putrel; } /* Bkwd rel or global. */ + /* Bkwd rel or global. */ + if (n <= 246) { CK(n>=10||*pl<0, RANGE_LG); CKPL(lg, LG); goto putrel; } pl -= 246; n = *pl; if (n < 0) n = 0; /* Start new chain for fwd rel if label exists. */ goto linkrel; |