rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

small problems with limits and jumps

This commit is contained in:
Roberto Ierusalimschy 2000-03-16 15:03:09 -03:00
parent 3860c5934e
commit 06f08f5634
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcode.c
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lcode.c,v 1.11 2000/03/13 20:37:16 roberto Exp roberto $ ** $Id: lcode.c,v 1.12 2000/03/15 20:50:33 roberto Exp roberto $
** Code generator for Lua ** Code generator for Lua
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -38,7 +38,7 @@ static Instruction *previous_instruction (FuncState *fs) {
static int luaK_primitivecode (FuncState *fs, Instruction i) { static int luaK_primitivecode (FuncState *fs, Instruction i) {
luaM_growvector(fs->L, fs->f->code, fs->pc, 1, Instruction, codeEM, MAXARG_S); luaM_growvector(fs->L, fs->f->code, fs->pc, 1, Instruction, codeEM, MAX_INT);
fs->f->code[fs->pc] = i; fs->f->code[fs->pc] = i;
return fs->pc++; return fs->pc++;
} }
@ -114,6 +114,7 @@ static void luaK_neq (FuncState *fs) {
if (*previous == CREATE_U(OP_PUSHNIL, 1)) { if (*previous == CREATE_U(OP_PUSHNIL, 1)) {
fs->pc--; /* remove PUSHNIL */ fs->pc--; /* remove PUSHNIL */
luaK_deltastack(fs, -1); /* undo effect of PUSHNIL */ luaK_deltastack(fs, -1); /* undo effect of PUSHNIL */
luaK_getlabel(fs); /* previous instruction could be a (closed) call */
} }
else else
luaK_S(fs, OP_IFNEQJMP, 0, -2); luaK_S(fs, OP_IFNEQJMP, 0, -2);
@ -150,12 +151,14 @@ int luaK_code (FuncState *fs, Instruction i, int delta) {
void luaK_fixjump (FuncState *fs, int pc, int dest) { void luaK_fixjump (FuncState *fs, int pc, int dest) {
Instruction *jmp = &fs->f->code[pc]; Instruction *jmp = &fs->f->code[pc];
if (dest != NO_JUMP) { if (dest == NO_JUMP)
/* jump is relative to position following jump instruction */
SETARG_S(*jmp, dest-(pc+1));
}
else
SETARG_S(*jmp, 0); /* absolute value to represent end of list */ SETARG_S(*jmp, 0); /* absolute value to represent end of list */
else { /* jump is relative to position following jump instruction */
int offset = dest-(pc+1);
if (offset < -MAXARG_S || offset > MAXARG_S)
luaK_error(fs->ls, "control structure too long");
SETARG_S(*jmp, offset);
}
} }
@ -164,7 +167,7 @@ static int luaK_getjump (FuncState *fs, int pc) {
if (offset == 0) if (offset == 0)
return NO_JUMP; /* end of list */ return NO_JUMP; /* end of list */
else else
return (pc+1)+offset; return (pc+1)+offset; /* turn offset into absolute position */
} }
@ -344,9 +347,9 @@ static void luaK_patchlistaux (FuncState *fs, int list, int target,
Instruction *i = &code[list]; Instruction *i = &code[list];
OpCode op = GET_OPCODE(*i); OpCode op = GET_OPCODE(*i);
if (op == special) /* this `op' already has a value */ if (op == special) /* this `op' already has a value */
SETARG_S(*i, special_target-(list+1)); luaK_fixjump(fs, list, special_target);
else { else {
SETARG_S(*i, target-(list+1)); /* do the patch */ luaK_fixjump(fs, list, target); /* do the patch */
if (op == OP_ONTJMP) /* remove eventual values */ if (op == OP_ONTJMP) /* remove eventual values */
SET_OPCODE(*i, OP_IFTJMP); SET_OPCODE(*i, OP_IFTJMP);
else if (op == OP_ONFJMP) else if (op == OP_ONFJMP)

23
lopcodes.h
View File

@ -1,5 +1,5 @@
/* /*
** $Id: lopcodes.h,v 1.48 2000/03/10 18:37:44 roberto Exp roberto $ ** $Id: lopcodes.h,v 1.49 2000/03/13 20:37:16 roberto Exp roberto $
** Opcodes for Lua virtual machine ** Opcodes for Lua virtual machine
** See Copyright Notice in lua.h ** See Copyright Notice in lua.h
*/ */
@ -161,4 +161,25 @@ OP_SETLINE/* U - - LINE=u */
#define LFIELDS_PER_FLUSH 64 /* FPF - lists (SETLIST) (<=MAXARG_B) */ #define LFIELDS_PER_FLUSH 64 /* FPF - lists (SETLIST) (<=MAXARG_B) */
/*
** we use int to manipulte most arguments, so they must fit
*/
#if MAXARG_U > MAX_INT
#undef MAXARG_U
#define MAXARG_U MAX_INT
#endif
#if MAXARG_S > MAX_INT
#undef MAXARG_S
#define MAXARG_S MAX_INT
#endif
#if MAXARG_A > MAX_INT
#undef MAXARG_A
#define MAXARG_A MAX_INT
#endif
#if MAXARG_B > MAX_INT
#undef MAXARG_B
#define MAXARG_B MAX_INT
#endif
#endif #endif