From 38e69595be760ead9fa4da7ac714c095e9f095b3 Mon Sep 17 00:00:00 2001
From: daurnimator <quae@daurnimator.com>
Date: Tue, 9 May 2017 14:07:18 +1000
Subject: Rename lopcodes.js require to consistently be lopcodes
---
src/lcode.js | 88 +++++++++++++++++++++++++++++-----------------------------
src/ldebug.js | 39 +++++++++++++-------------
src/lparser.js | 14 +++++-----
src/lvm.js | 12 ++++----
4 files changed, 77 insertions(+), 76 deletions(-)
(limited to 'src')
diff --git a/src/lcode.js b/src/lcode.js
index 0ce7526..1235fe4 100644
--- a/src/lcode.js
+++ b/src/lcode.js
@@ -5,7 +5,7 @@ const assert = require('assert');
const defs = require('./defs.js');
const llex = require('./llex.js');
const lobject = require('./lobject.js');
-const lopcode = require('./lopcodes.js');
+const lopcodes = require('./lopcodes.js');
const lparser = require('./lparser.js');
const lstring = require('./lstring.js');
const ltable = require('./ltable.js');
@@ -13,7 +13,7 @@ const ltm = require('./ltm.js');
const lvm = require('./lvm.js');
const CT = defs.CT;
-const OpCodesI = lopcode.OpCodesI;
+const OpCodesI = lopcodes.OpCodesI;
const TValue = lobject.TValue;
const luaO_arith = function(L, op, p1, p2, res) {
@@ -150,8 +150,8 @@ const luaK_nil = function(fs, from, n) {
(from <= pfrom && pfrom <= l + 1)) { /* can connect both? */
if (pfrom < from) from = pfrom; /* from = min(from, pfrom) */
if (pl > l) l = pl; /* l = max(l, pl) */
- lopcode.SETARG_A(previous, from);
- lopcode.SETARG_B(previous, l - from);
+ lopcodes.SETARG_A(previous, from);
+ lopcodes.SETARG_B(previous, l - from);
return;
}
} /* else go through */
@@ -183,9 +183,9 @@ const fixjump = function(fs, pc, dest) {
let jmp = fs.f.code[pc];
let offset = dest - (pc + 1);
assert(dest !== NO_JUMP);
- if (Math.abs(offset) > lopcode.MAXARG_sBx)
+ if (Math.abs(offset) > lopcodes.MAXARG_sBx)
llex.luaX_syntaxerror(fs.ls, defs.to_luastring("control structure too long", true));
- lopcode.SETARG_sBx(jmp, offset);
+ lopcodes.SETARG_sBx(jmp, offset);
};
/*
@@ -257,7 +257,7 @@ const luaK_getlabel = function(fs) {
** unconditional.
*/
const getjumpcontrol = function(fs, pc) {
- if (pc >= 1 && lopcode.testTMode(fs.f.code[pc - 1].opcode))
+ if (pc >= 1 && lopcodes.testTMode(fs.f.code[pc - 1].opcode))
return fs.f.code[pc - 1];
else
return fs.f.code[pc];
@@ -274,12 +274,12 @@ const patchtestreg = function(fs, node, reg) {
let i = getjumpcontrol(fs, node);
if (i.opcode !== OpCodesI.OP_TESTSET)
return false; /* cannot patch other instructions */
- if (reg !== lopcode.NO_REG && reg !== i.B)
- lopcode.SETARG_A(i, reg);
+ if (reg !== lopcodes.NO_REG && reg !== i.B)
+ lopcodes.SETARG_A(i, reg);
else {
/* no register to put value or register already has the value;
change instruction to simple test */
- i = lopcode.CREATE_ABC(OpCodesI.OP_TEST, i.B, 0, i.C);
+ i = lopcodes.CREATE_ABC(OpCodesI.OP_TEST, i.B, 0, i.C);
}
return true;
};
@@ -289,7 +289,7 @@ const patchtestreg = function(fs, node, reg) {
*/
const removevalues = function(fs, list) {
for (; list !== NO_JUMP; list = getjump(fs, list))
- patchtestreg(fs, list, lopcode.NO_REG);
+ patchtestreg(fs, list, lopcodes.NO_REG);
};
/*
@@ -314,7 +314,7 @@ const patchlistaux = function(fs, list, vtarget, reg, dtarget) {
** jumps
*/
const dischargejpc = function(fs) {
- patchlistaux(fs, fs.jpc, fs.pc, lopcode.NO_REG, fs.pc);
+ patchlistaux(fs, fs.jpc, fs.pc, lopcodes.NO_REG, fs.pc);
fs.jpc = NO_JUMP;
};
@@ -337,7 +337,7 @@ const luaK_patchlist = function(fs, list, target) {
luaK_patchtohere(fs, list); /* add list to pending jumps */
else {
assert(target < fs.pc);
- patchlistaux(fs, list, target, lopcode.NO_REG, target);
+ patchlistaux(fs, list, target, lopcodes.NO_REG, target);
}
};
@@ -351,7 +351,7 @@ const luaK_patchclose = function(fs, list, level) {
for (; list !== NO_JUMP; list = getjump(fs, list)) {
let ins = fs.f.code[list];
assert(ins.opcode === OpCodesI.OP_JMP && (ins.A === 0 || ins.A >= level));
- lopcode.SETARG_A(ins, level);
+ lopcodes.SETARG_A(ins, level);
}
};
@@ -373,33 +373,33 @@ const luaK_code = function(fs, i) {
** of parameters versus opcode.)
*/
const luaK_codeABC = function(fs, o, a, b, c) {
- assert(lopcode.getOpMode(o) === lopcode.iABC);
- assert(lopcode.getBMode(o) !== lopcode.OpArgN || b === 0);
- assert(lopcode.getCMode(o) !== lopcode.OpArgN || c === 0);
- assert(a <= lopcode.MAXARG_A && b <= lopcode.MAXARG_B && c <= lopcode.MAXARG_C);
- return luaK_code(fs, lopcode.CREATE_ABC(o, a, b, c));
+ assert(lopcodes.getOpMode(o) === lopcodes.iABC);
+ assert(lopcodes.getBMode(o) !== lopcodes.OpArgN || b === 0);
+ assert(lopcodes.getCMode(o) !== lopcodes.OpArgN || c === 0);
+ assert(a <= lopcodes.MAXARG_A && b <= lopcodes.MAXARG_B && c <= lopcodes.MAXARG_C);
+ return luaK_code(fs, lopcodes.CREATE_ABC(o, a, b, c));
};
/*
** Format and emit an 'iABx' instruction.
*/
const luaK_codeABx = function(fs, o, a, bc) {
- assert(lopcode.getOpMode(o) === lopcode.iABx || lopcode.getOpMode(o) === lopcode.iAsBx);
- assert(lopcode.getCMode(o) === lopcode.OpArgN);
- assert(a <= lopcode.MAXARG_A && bc <= lopcode.MAXARG_Bx);
- return luaK_code(fs, lopcode.CREATE_ABx(o, a, bc));
+ assert(lopcodes.getOpMode(o) === lopcodes.iABx || lopcodes.getOpMode(o) === lopcodes.iAsBx);
+ assert(lopcodes.getCMode(o) === lopcodes.OpArgN);
+ assert(a <= lopcodes.MAXARG_A && bc <= lopcodes.MAXARG_Bx);
+ return luaK_code(fs, lopcodes.CREATE_ABx(o, a, bc));
};
const luaK_codeAsBx = function(fs,o,A,sBx) {
- return luaK_codeABx(fs, o, A, (sBx) + lopcode.MAXARG_sBx);
+ return luaK_codeABx(fs, o, A, (sBx) + lopcodes.MAXARG_sBx);
};
/*
** Emit an "extra argument" instruction (format 'iAx')
*/
const codeextraarg = function(fs, a) {
- assert(a <= lopcode.MAXARG_Ax);
- return luaK_code(fs, lopcode.CREATE_Ax(OpCodesI.OP_EXTRAARG, a));
+ assert(a <= lopcodes.MAXARG_Ax);
+ return luaK_code(fs, lopcodes.CREATE_Ax(OpCodesI.OP_EXTRAARG, a));
};
/*
@@ -408,7 +408,7 @@ const codeextraarg = function(fs, a) {
** instruction with "extra argument".
*/
const luaK_codek = function(fs, reg, k) {
- if (k <= lopcode.MAXARG_Bx)
+ if (k <= lopcodes.MAXARG_Bx)
return luaK_codeABx(fs, OpCodesI.OP_LOADK, reg, k);
else {
let p = luaK_codeABx(fs, OpCodesI.OP_LOADKX, reg, 0);
@@ -443,7 +443,7 @@ const luaK_reserveregs = function(fs, n) {
** a local variable.
*/
const freereg = function(fs, reg) {
- if (!lopcode.ISK(reg) && reg >= fs.nactvar) {
+ if (!lopcodes.ISK(reg) && reg >= fs.nactvar) {
fs.freereg--;
assert(reg === fs.freereg);
}
@@ -557,12 +557,12 @@ const nilK = function(fs) {
const luaK_setreturns = function(fs, e, nresults) {
let ek = lparser.expkind;
if (e.k === ek.VCALL) { /* expression is an open function call? */
- lopcode.SETARG_C(getinstruction(fs, e), nresults + 1);
+ lopcodes.SETARG_C(getinstruction(fs, e), nresults + 1);
}
else if (e.k === ek.VVARARG) {
let pc = getinstruction(fs, e);
- lopcode.SETARG_B(pc, nresults + 1);
- lopcode.SETARG_A(pc, fs.freereg);
+ lopcodes.SETARG_B(pc, nresults + 1);
+ lopcodes.SETARG_A(pc, fs.freereg);
luaK_reserveregs(fs, 1);
}
else assert(nresults === defs.LUA_MULTRET);
@@ -590,7 +590,7 @@ const luaK_setoneret = function(fs, e) {
e.k = ek.VNONRELOC; /* result has fixed position */
e.u.info = getinstruction(fs, e).A;
} else if (e.k === ek.VVARARG) {
- lopcode.SETARG_B(getinstruction(fs, e), 2);
+ lopcodes.SETARG_B(getinstruction(fs, e), 2);
e.k = ek.VRELOCABLE; /* can relocate its simple result */
}
};
@@ -668,7 +668,7 @@ const discharge2reg = function(fs, e, reg) {
}
case ek.VRELOCABLE: {
let pc = getinstruction(fs, e);
- lopcode.SETARG_A(pc, reg); /* instruction will put result in 'reg' */
+ lopcodes.SETARG_A(pc, reg); /* instruction will put result in 'reg' */
break;
}
case ek.VNONRELOC: {
@@ -810,8 +810,8 @@ const luaK_exp2RK = function(fs, e) {
if (vk) {
e.k = ek.VK;
- if (e.u.info <= lopcode.MAXINDEXRK) /* constant fits in 'argC'? */
- return lopcode.RKASK(e.u.info);
+ if (e.u.info <= lopcodes.MAXINDEXRK) /* constant fits in 'argC'? */
+ return lopcodes.RKASK(e.u.info);
}
/* not a constant in the right range: put it in a register */
@@ -864,8 +864,8 @@ const luaK_self = function(fs, e, key) {
*/
const negatecondition = function(fs, e) {
let pc = getjumpcontrol(fs, e.u.info);
- assert(lopcode.testTMode(pc.opcode) && pc.opcode !== OpCodesI.OP_TESTSET && pc.opcode !== OpCodesI.OP_TEST);
- lopcode.SETARG_A(pc, !(pc.A));
+ assert(lopcodes.testTMode(pc.opcode) && pc.opcode !== OpCodesI.OP_TESTSET && pc.opcode !== OpCodesI.OP_TEST);
+ lopcodes.SETARG_A(pc, !(pc.A));
};
/*
@@ -885,7 +885,7 @@ const jumponcond = function(fs, e, cond) {
}
discharge2anyreg(fs, e);
freeexp(fs, e);
- return condjump(fs, OpCodesI.OP_TESTSET, lopcode.NO_REG, e.u.info, cond);
+ return condjump(fs, OpCodesI.OP_TESTSET, lopcodes.NO_REG, e.u.info, cond);
};
/*
@@ -1072,7 +1072,7 @@ const codecomp = function(fs, opr, e1, e2) {
let rk1;
if (e1.k === ek.VK)
- rk1 = lopcode.RKASK(e1.u.info);
+ rk1 = lopcodes.RKASK(e1.u.info);
else {
assert(e1.k === ek.VNONRELOC);
rk1 = e1.u.info;
@@ -1185,7 +1185,7 @@ const luaK_posfix = function(fs, op, e1, e2, line) {
if (e2.k === ek.VRELOCABLE && ins.opcode === OpCodesI.OP_CONCAT) {
assert(e1.u.info === ins.B - 1);
freeexp(fs, e1);
- lopcode.SETARG_B(ins, e1.u.info);
+ lopcodes.SETARG_B(ins, e1.u.info);
e1.k = ek.VRELOCABLE; e1.u.info = e2.u.info;
}
else {
@@ -1227,12 +1227,12 @@ const luaK_fixline = function(fs, line) {
** table (or LUA_MULTRET to add up to stack top).
*/
const luaK_setlist = function(fs, base, nelems, tostore) {
- let c = (nelems - 1)/lopcode.LFIELDS_PER_FLUSH + 1;
+ let c = (nelems - 1)/lopcodes.LFIELDS_PER_FLUSH + 1;
let b = (tostore === defs.LUA_MULTRET) ? 0 : tostore;
- assert(tostore !== 0 && tostore <= lopcode.LFIELDS_PER_FLUSH);
- if (c <= lopcode.MAXARG_C)
+ assert(tostore !== 0 && tostore <= lopcodes.LFIELDS_PER_FLUSH);
+ if (c <= lopcodes.MAXARG_C)
luaK_codeABC(fs, OpCodesI.OP_SETLIST, base, b, c);
- else if (c <= lopcode.MAXARG_Ax) {
+ else if (c <= lopcodes.MAXARG_Ax) {
luaK_codeABC(fs, OpCodesI.OP_SETLIST, base, b, 0);
codeextraarg(fs, c);
}
diff --git a/src/ldebug.js b/src/ldebug.js
index 6a16b9c..e0e2366 100644
--- a/src/ldebug.js
+++ b/src/ldebug.js
@@ -3,19 +3,20 @@
const assert = require('assert');
-const defs = require('./defs.js');
-const ldo = require('./ldo.js');
-const lobject = require('./lobject.js');
-const lstate = require('./lstate.js');
-const ltable = require('./ltable.js');
-const luaconf = require('./luaconf.js');
-const OC = require('./lopcodes.js');
-const lvm = require('./lvm.js');
-const ltm = require('./ltm.js');
-const lfunc = require('./lfunc.js');
-const TValue = lobject.TValue;
-const CT = defs.constant_types;
-const TS = defs.thread_status;
+const defs = require('./defs.js');
+const ldo = require('./ldo.js');
+const lfunc = require('./lfunc.js');
+const lobject = require('./lobject.js');
+const lopcodes = require('./lopcodes.js');
+const lstate = require('./lstate.js');
+const ltable = require('./ltable.js');
+const ltm = require('./ltm.js');
+const luaconf = require('./luaconf.js');
+const lvm = require('./lvm.js');
+
+const TValue = lobject.TValue;
+const CT = defs.constant_types;
+const TS = defs.thread_status;
const currentline = function(ci) {
return ci.func.value.p.lineinfo ? ci.func.value.p.lineinfo[ci.pcOff-1] : -1;
@@ -294,8 +295,8 @@ const kname = function(p, pc, c) {
funcname: null
};
- if (OC.ISK(c)) { /* is 'c' a constant? */
- let kvalue = p.k[OC.INDEXK(c)];
+ if (lopcodes.ISK(c)) { /* is 'c' a constant? */
+ let kvalue = p.k[lopcodes.INDEXK(c)];
if (kvalue.ttisstring()) { /* literal constant? */
r.name = kvalue.svalue(); /* it is its own name */
return r;
@@ -326,7 +327,7 @@ const findsetreg = function(p, lastpc, reg) {
let jmptarget = 0; /* any code before this address is conditional */
for (let pc = 0; pc < lastpc; pc++) {
let i = p.code[pc];
- let op = OC.OpCodes[i.opcode];
+ let op = lopcodes.OpCodes[i.opcode];
let a = i.A;
switch (op) {
case 'OP_LOADNIL': {
@@ -357,7 +358,7 @@ const findsetreg = function(p, lastpc, reg) {
break;
}
default:
- if (OC.testAMode(i.opcode) && reg === a)
+ if (lopcodes.testAMode(i.opcode) && reg === a)
setreg = filterpc(pc, jmptarget);
break;
}
@@ -382,7 +383,7 @@ const getobjname = function(p, lastpc, reg) {
let pc = findsetreg(p, lastpc, reg);
if (pc !== -1) { /* could find instruction? */
let i = p.code[pc];
- let op = OC.OpCodes[i.opcode];
+ let op = lopcodes.OpCodes[i.opcode];
switch (op) {
case 'OP_MOVE': {
let b = i.B; /* move from 'b' to 'a' */
@@ -450,7 +451,7 @@ const funcnamefromcode = function(L, ci) {
return r;
}
- switch (OC.OpCodes[i.opcode]) {
+ switch (lopcodes.OpCodes[i.opcode]) {
case 'OP_CALL':
case 'OP_TAILCALL':
return getobjname(p, pc, i.A); /* get function name */
diff --git a/src/lparser.js b/src/lparser.js
index 57869d0..3c50163 100644
--- a/src/lparser.js
+++ b/src/lparser.js
@@ -8,11 +8,11 @@ const lfunc = require('./lfunc.js');
const llex = require('./llex.js');
const llimit = require('./llimit.js');
const lobject = require('./lobject.js');
-const lopcode = require('./lopcodes.js');
+const lopcodes = require('./lopcodes.js');
const lstring = require('./lstring.js');
const ltable = require('./ltable.js');
const BinOpr = lcode.BinOpr;
-const OpCodesI = lopcode.OpCodesI;
+const OpCodesI = lopcodes.OpCodesI;
const Proto = lfunc.Proto;
const R = llex.RESERVED;
const TValue = lobject.TValue;
@@ -665,7 +665,7 @@ const closelistfield = function(fs, cc) {
if (cc.v.k === expkind.VVOID) return; /* there is no list item */
lcode.luaK_exp2nextreg(fs, cc.v);
cc.v.k = expkind.VVOID;
- if (cc.tostore === lopcode.LFIELDS_PER_FLUSH) {
+ if (cc.tostore === lopcodes.LFIELDS_PER_FLUSH) {
lcode.luaK_setlist(fs, cc.t.u.info, cc.na, cc.tostore); /* flush */
cc.tostore = 0; /* no more items pending */
}
@@ -734,8 +734,8 @@ const constructor = function(ls, t) {
} while (testnext(ls, char[',']) || testnext(ls, char[';']));
check_match(ls, char['}'], char['{'], line);
lastlistfield(fs, cc);
- lopcode.SETARG_B(fs.f.code[pc], lobject.luaO_int2fb(cc.na)); /* set initial array size */
- lopcode.SETARG_C(fs.f.code[pc], lobject.luaO_int2fb(cc.nh)); /* set initial table size */
+ lopcodes.SETARG_B(fs.f.code[pc], lobject.luaO_int2fb(cc.na)); /* set initial array size */
+ lopcodes.SETARG_C(fs.f.code[pc], lobject.luaO_int2fb(cc.nh)); /* set initial table size */
};
/* }====================================================================== */
@@ -1432,7 +1432,7 @@ const exprstat= function(ls) {
}
else { /* stat -> func */
check_condition(ls, v.v.k === expkind.VCALL, defs.to_luastring("syntax error", true));
- lopcode.SETARG_C(lcode.getinstruction(fs, v.v), 1); /* call statement uses no results */
+ lopcodes.SETARG_C(lcode.getinstruction(fs, v.v), 1); /* call statement uses no results */
}
};
@@ -1448,7 +1448,7 @@ const retstat = function(ls) {
if (hasmultret(e.k)) {
lcode.luaK_setmultret(fs, e);
if (e.k === expkind.VCALL && nret === 1) { /* tail call? */
- lopcode.SET_OPCODE(lcode.getinstruction(fs, e), OpCodesI.OP_TAILCALL);
+ lopcodes.SET_OPCODE(lcode.getinstruction(fs, e), OpCodesI.OP_TAILCALL);
assert(lcode.getinstruction(fs, e).A === fs.nactvar);
}
first = fs.nactvar;
diff --git a/src/lvm.js b/src/lvm.js
index 38eb922..760f686 100644
--- a/src/lvm.js
+++ b/src/lvm.js
@@ -4,7 +4,7 @@
const assert = require('assert');
const defs = require('./defs.js');
-const OC = require('./lopcodes.js');
+const lopcodes = require('./lopcodes.js');
const luaconf = require('./luaconf.js');
const lobject = require('./lobject.js');
const lfunc = require('./lfunc.js');
@@ -23,7 +23,7 @@ const LUA_MULTRET = defs.LUA_MULTRET;
*/
const luaV_finishOp = function(L) {
let ci = L.ci;
- let OCi = OC.OpCodesI;
+ let OCi = lopcodes.OpCodesI;
let base = ci.l_base;
let inst = ci.l_savedpc[ci.pcOff - 1]; /* interrupted instruction */
let op = inst.opcode;
@@ -91,15 +91,15 @@ const RC = function(L, base, i) {
};
const RKB = function(L, base, k, i) {
- return OC.ISK(i.B) ? k[OC.INDEXK(i.B)] : L.stack[base + i.B];
+ return lopcodes.ISK(i.B) ? k[lopcodes.INDEXK(i.B)] : L.stack[base + i.B];
};
const RKC = function(L, base, k, i) {
- return OC.ISK(i.C) ? k[OC.INDEXK(i.C)] : L.stack[base + i.C];
+ return lopcodes.ISK(i.C) ? k[lopcodes.INDEXK(i.C)] : L.stack[base + i.C];
};
const luaV_execute = function(L) {
- const OCi = OC.OpCodesI;
+ const OCi = lopcodes.OpCodesI;
let ci = L.ci;
ci.callstatus |= lstate.CIST_FRESH;
@@ -644,7 +644,7 @@ const luaV_execute = function(L) {
}
let h = L.stack[ra].value;
- let last = ((c - 1) * OC.LFIELDS_PER_FLUSH) + n;
+ let last = ((c - 1) * lopcodes.LFIELDS_PER_FLUSH) + n;
for (; n > 0; n--) {
ltable.luaH_setint(h, last--, L.stack[ra + n]);
--
cgit v1.2.3-70-g09d2