Added IntOp and System::Int64Op >>> SHR operator

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6926 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2017-10-08 15:26:54 +00:00
parent b97de6887d
commit 99235da725
9 changed files with 25 additions and 15 deletions

View file

@ -719,6 +719,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
case 10: if (v2) v%=v2; else { v=0; exec_error++; } break;
case 11: v=v<<v2; break;
case 12: v=v>>v2; break;
case 13: v=(unsigned int)v>>(unsigned int)v2; break;
}
myitoa(p,v);
}

View file

@ -97,7 +97,7 @@ enum
#endif
#ifdef NSIS_SUPPORT_INTOPTS
EW_INTCMP, // IntCmp: 6 [val1, val2, equal, val1<val2, val1>val2, unsigned?]
EW_INTOP, // IntOp: 4 [output, input1, input2, op] where op: 0=add, 1=sub, 2=mul, 3=div, 4=bor, 5=band, 6=bxor, 7=bnot input1, 8=lnot input1, 9=lor, 10=land], 11=1%2
EW_INTOP, // IntOp: 4 [output, input1, input2, op] where op: 0=add, 1=sub, 2=mul, 3=div, 4=bor, 5=band, 6=bxor, 7=bnot input1, 8=lor, 9=land 10=mod, 11=shl, 12=sar, 13=shr (bneg is implemented with bxor in compiler)
EW_INTFMT, // IntFmt: [output, format, input]
#endif
#ifdef NSIS_SUPPORT_STACK