nzp-team
/
fteqw
mirror of https://github.com/nzp-team/fteqw.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Small tweeks. The stack is always aligned now. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1208 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-08-07 13:21:48 +00:00
parent 6cafda8ffa
commit d1d0989ab3
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
engine/common/qvm.c
View File

@ -241,8 +241,8 @@ typedef struct qvm_s
{ {
// segments // segments
unsigned long *cs; // code segment, each instruction is 2 longs unsigned long *cs; // code segment, each instruction is 2 longs
qbyte *ds; // data segment, partially filled on load qbyte *ds; // data segment, partially filled on load (data, lit, bss)
qbyte *ss; // stack segment qbyte *ss; // stack segment, (follows immediatly after ds, corrupting data before vm)
// pointer registers // pointer registers
unsigned long *pc; // program counter, points to cs, goes up unsigned long *pc; // program counter, points to cs, goes up
@ -253,7 +253,7 @@ typedef struct qvm_s
unsigned int len_cs; // size of cs unsigned int len_cs; // size of cs
unsigned int len_ds; // size of ds unsigned int len_ds; // size of ds
unsigned int len_ss; // size of ss unsigned int len_ss; // size of ss
unsigned long ds_mask; // ds mask unsigned long ds_mask; // ds mask (ds+ss)
// memory // memory
unsigned int mem_size; unsigned int mem_size;
@ -403,9 +403,8 @@ qvm_t *QVM_Load(const char *name, sys_callex_t syscall)
// create vitrual machine // create vitrual machine
qvm=Z_Malloc(sizeof(qvm_t)); qvm=Z_Malloc(sizeof(qvm_t));
qvm->len_cs=header->instructionCount+1; //bad opcode padding. qvm->len_cs=header->instructionCount+1; //bad opcode padding.
qvm->len_ds=header->dataOffset+header->litLength+header->bssLength; qvm->len_ds=header->dataLength+header->litLength+header->bssLength;
qvm->len_ss=256*1024; // 256KB stack space qvm->len_ss=256*1024; // 256KB stack space
// qvm->ds_mask=0xFFFFFFFF; // FIXME: make real mask to fit ds+ss size
// memory // memory
qvm->ds_mask = qvm->len_ds*sizeof(qbyte)+(qvm->len_ss+4)*sizeof(qbyte);//+4 for a stack check decrease qvm->ds_mask = qvm->len_ds*sizeof(qbyte)+(qvm->len_ss+4)*sizeof(qbyte);//+4 for a stack check decrease
@ -414,8 +413,9 @@ qvm_t *QVM_Load(const char *name, sys_callex_t syscall)
if ((1<<i) >= qvm->ds_mask) //is this bit greater than our minimum? if ((1<<i) >= qvm->ds_mask) //is this bit greater than our minimum?
break; break;
} }
qvm->len_ss = (1<<i) - qvm->len_ds*sizeof(qbyte) - 4-1; //expand the stack space to fill it. qvm->len_ss = (1<<i) - qvm->len_ds*sizeof(qbyte) - 4; //expand the stack space to fill it.
qvm->ds_mask = qvm->len_ds*sizeof(qbyte)+(qvm->len_ss+4)*sizeof(qbyte); qvm->ds_mask = qvm->len_ds*sizeof(qbyte)+(qvm->len_ss+4)*sizeof(qbyte);
qvm->len_ss -= qvm->len_ss&7;
qvm->mem_size=qvm->len_cs*sizeof(long)*2 + qvm->ds_mask; qvm->mem_size=qvm->len_cs*sizeof(long)*2 + qvm->ds_mask;
@ -433,6 +433,11 @@ qvm_t *QVM_Load(const char *name, sys_callex_t syscall)
qvm->cycles=0; qvm->cycles=0;
qvm->syscall=syscall; qvm->syscall=syscall;
qvm->ds_mask--;
qvm->ds_mask=0xFFFFFFFF; // FIXME: make real mask to fit ds+ss size
// load instructions // load instructions
{ {
qbyte *src=raw+header->codeOffset; qbyte *src=raw+header->codeOffset;
@ -561,12 +566,15 @@ static void inline QVM_Enter(qvm_t *vm, long size)
{ {
long *fp; long *fp;
if (size&3)
Con_Printf("QVM_Enter: size&3\n");
vm->bp-=size; vm->bp-=size;
if(vm->bp<vm->len_ds) if(vm->bp<vm->len_ds)
Sys_Error("VM run time error: out of stack\n"); Sys_Error("VM run time error: out of stack\n");
fp=(long*)(vm->ds+vm->bp); fp=(long*)(vm->ds+vm->bp);
fp[0]=fp[1]; // unknown /maybe size/ fp[0]=0; // unknown /maybe size/
fp[1]=*vm->sp++; // saved PC fp[1]=*vm->sp++; // saved PC
if ((long*)vm->sp > (long*)(vm->ss+vm->len_ss)) Sys_Error("QVM Stack overflow"); if ((long*)vm->sp > (long*)(vm->ss+vm->len_ss)) Sys_Error("QVM Stack overflow");
@ -579,6 +587,9 @@ static void inline QVM_Return(qvm_t *vm, long size)
{ {
long *fp; long *fp;
if (size&3)
Con_Printf("QVM_Return: size&3\n");
fp=(long*)(vm->ds+vm->bp); fp=(long*)(vm->ds+vm->bp);
vm->bp+=size; vm->bp+=size;
@ -593,7 +604,7 @@ static void inline QVM_Return(qvm_t *vm, long size)
Sys_Error("VM run time error: program returned to negative hyperspace\n"); Sys_Error("VM run time error: program returned to negative hyperspace\n");
vm->pc=vm->cs+fp[1]; // restore PC vm->pc=vm->cs+fp[1]; // restore PC
fp[1] = fp[0]; // fp[1] = fp[0];
} }
@ -613,7 +624,7 @@ int QVM_Exec(register qvm_t *qvm, int command, int arg0, int arg1, int arg2, int
//all stack shifts in this function are referenced through these 2 macros. //all stack shifts in this function are referenced through these 2 macros.
#define POP(t) qvm->sp+=t;if (qvm->sp > stackstart) Sys_Error("QVM Stack underflow"); #define POP(t) qvm->sp+=t;if (qvm->sp > stackstart) Sys_Error("QVM Stack underflow");
#define PUSH(v) qvm->sp--;if (qvm->sp < stackend) Sys_Error("QVM Stack overflow");*qvm->sp=v #define PUSH(v) qvm->sp--;if (qvm->sp < stackend) Sys_Error("QVM Stack overflow");*qvm->sp=v
register qvm_op_t op; register qvm_op_t op=-1;
register unsigned long param; register unsigned long param;
long *fp; long *fp;
@ -629,7 +640,7 @@ int QVM_Exec(register qvm_t *qvm, int command, int arg0, int arg1, int arg2, int
qvm->bp=qvm->len_ds+qvm->len_ss/2; qvm->bp=qvm->len_ds+qvm->len_ss/2;
qvm->cycles=0; qvm->cycles=0;
// prepare local stack // prepare local stack
qvm->bp-=13+2; qvm->bp-=(13+2)*sizeof(int);
fp=(long*)(qvm->ds+qvm->bp); fp=(long*)(qvm->ds+qvm->bp);
// push all params // push all params
fp[0]=0; fp[0]=0;
@ -795,7 +806,7 @@ int QVM_Exec(register qvm_t *qvm, int command, int arg0, int arg1, int arg2, int
POP(2); POP(2);
break; break;
case OP_ARG: case OP_ARG:
*(unsigned long*)&qvm->ds[(param+qvm->bp)&qvm->ds_mask]=qvm->sp[0]; *(unsigned long*)&qvm->ds[(qvm->bp+param)&qvm->ds_mask]=qvm->sp[0];
POP(1); POP(1);
break; break;
case OP_BLOCK_COPY: case OP_BLOCK_COPY: