Browse Source

Let the compiler use OP_ADD instead of OP_CAT

pull/44/head
Rafal Kupiec 3 years ago
parent
commit
e4ab5974fa
Signed by: belliash GPG Key ID: 4E829243E0CFE6B4
2 changed files with 9 additions and 4 deletions
  1. +1
    -1
      engine/compiler.c
  2. +8
    -3
      engine/vm.c

+ 1
- 1
engine/compiler.c View File

@ -778,7 +778,7 @@ static sxi32 GenStateCompileString(ph7_gen_state *pGen) {
}/*for(;;)*/
if(iCons > 1) {
/* Concatenate all compiled constants */
PH7_VmEmitInstr(pGen->pVm, PH7_OP_CAT, iCons, 0, 0, 0);
PH7_VmEmitInstr(pGen->pVm, PH7_OP_ADD, iCons, 1, 0, 0);
}
/* Node successfully compiled */
return SXRET_OK;


+ 8
- 3
engine/vm.c View File

@ -3394,19 +3394,24 @@ static sxi32 VmByteCodeExec(
VmPopOperand(&pTos, 1);
break;
}
/* OP_ADD * * *
/* OP_ADD P1 P2 *
*
* Pop the top two elements from the stack, add them together,
* and push the result back onto the stack.
*/
case PH7_OP_ADD: {
ph7_value *pNos = &pTos[-1];
ph7_value *pNos;
if(pInstr->iP1 < 1) {
pNos = &pTos[-1];
} else {
pNos = &pTos[-pInstr->iP1 + 1];
}
#ifdef UNTRUST
if(pNos < pStack) {
goto Abort;
}
#endif
if(pNos->iFlags & MEMOBJ_STRING || pTos->iFlags & MEMOBJ_STRING) {
if(pInstr->iP2 || pNos->iFlags & MEMOBJ_STRING || pTos->iFlags & MEMOBJ_STRING) {
/* Perform the string addition */
ph7_value *pCur;
if((pNos->iFlags & MEMOBJ_STRING) == 0) {


Loading…
Cancel
Save