Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed queue prediction bug for labels and procs

Browse Source 
Fixed problem parsing "-" with single number expressions
Uploaded 1.02 win32 binary
This commit is contained in:
David Anderson
2004-08-21 06:20:27 +00:00
parent 49ee255fa4
commit 051657714c
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
compiler/scasm/amx_compiler.cpp
View File

@@ -1241,8 +1241,7 @@ Start:
}
case OP_SDIV_ALT:
{
CHK_PARAMS(1);
PUSH_PARAM(1, Sym_Dat);
CHK_PARAMS(0);
break;
}
case OP_UMUL:
@@ -1257,8 +1256,7 @@ Start:
}
case OP_UDIV_ALT:
{
CHK_PARAMS(1);
PUSH_PARAM(1, Sym_Dat);
CHK_PARAMS(0);
break;
}
case OP_ADD:
@@ -2310,7 +2308,7 @@ int Compiler::DerefSymbol(std::string &str, SymbolType sym)
{
ProcMngr::AsmProc *p = 0;
if ( ((p = PROC->FindProc(str)) == NULL) || p->ASM == NULL)
if ( ((p = PROC->FindProc(str)) == NULL) )
{
/* Labels we handle differently.
Add it to the label queue
@@ -2318,6 +2316,9 @@ int Compiler::DerefSymbol(std::string &str, SymbolType sym)
p = PROC->AddProc(S, NULL);
PROC->QueueProc(str, CurAsm());
val = ProcMngr::ncip;
} else if (p->ASM == NULL) {
PROC->QueueProc(str, CurAsm());
val = ProcMngr::ncip;
} else {
val = p->ASM->cip;
}
@@ -2355,6 +2356,9 @@ int Compiler::DerefSymbol(std::string &str, SymbolType sym)
L = CLabels->AddLabel(S, LabelMngr::ncip);
CLabels->QueueLabel(str, CurAsm());
LabelStack.push(str);
} else if (L->cip == LabelMngr::ncip) {
//if we don't queue the label the jump won't be resolved!
CLabels->QueueLabel(str, CurAsm());
}
val = L->cip;