jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement overflow/underflow checking for the VM.

Browse source
This commit is contained in:
EXetoC 2014-03-31 14:11:21 +02:00
commit b919ab790b
1 changed files with 49 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

55
compiler/vm.nim
View file

@ -495,18 +495,46 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
else: stackTrace(c, tos, pc, errNilAccess) else: stackTrace(c, tos, pc, errNilAccess)
of opcAddInt: of opcAddInt:
decodeBC(rkInt) decodeBC(rkInt)
regs[ra].intVal = regs[rb].intVal + regs[rc].intVal let
bVal = regs[rb].intVal
cVal = regs[rc].intVal
sum = bVal +% cVal
if (sum xor bVal) >= 0 or (sum xor cVal) >= 0:
regs[ra].intVal = sum
else:
stackTrace(c, tos, pc, errOverOrUnderflow)
of opcAddImmInt: of opcAddImmInt:
decodeBImm(rkInt) decodeBImm(rkInt)
#message(c.debug[pc], warnUser, "came here") #message(c.debug[pc], warnUser, "came here")
#debug regs[rb].node #debug regs[rb].node
regs[ra].intVal = regs[rb].intVal + imm let
bVal = regs[rb].intVal
cVal = imm
sum = bVal +% cVal
if (sum xor bVal) >= 0 or (sum xor cVal) >= 0:
regs[ra].intVal = sum
else:
stackTrace(c, tos, pc, errOverOrUnderflow)
of opcSubInt: of opcSubInt:
decodeBC(rkInt) decodeBC(rkInt)
regs[ra].intVal = regs[rb].intVal - regs[rc].intVal let
bVal = regs[rb].intVal
cVal = regs[rc].intVal
diff = bVal -% cVal
if (diff xor bVal) >= 0 or (diff xor not cVal) >= 0:
regs[ra].intVal = diff
else:
stackTrace(c, tos, pc, errOverOrUnderflow)
of opcSubImmInt: of opcSubImmInt:
decodeBImm(rkInt) decodeBImm(rkInt)
regs[ra].intVal = regs[rb].intVal - imm let
bVal = regs[rb].intVal
cVal = imm
diff = bVal -% cVal
if (diff xor bVal) >= 0 or (diff xor not cVal) >= 0:
regs[ra].intVal = diff
else:
stackTrace(c, tos, pc, errOverOrUnderflow)
of opcLenSeq: of opcLenSeq:
decodeBImm(rkInt) decodeBImm(rkInt)
#assert regs[rb].kind == nkBracket #assert regs[rb].kind == nkBracket
@ -539,7 +567,18 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
regs[ra].intVal = nimsets.cardSet(regs[rb].node) regs[ra].intVal = nimsets.cardSet(regs[rb].node)
of opcMulInt: of opcMulInt:
decodeBC(rkInt) decodeBC(rkInt)
regs[ra].intVal = regs[rb].intVal * regs[rc].intVal let
bVal = regs[rb].intVal
cVal = regs[rc].intVal
product = bVal *% cVal
floatProd = toBiggestFloat(bVal) * toBiggestFloat(cVal)
resAsFloat = toBiggestFloat(product)
if resAsFloat == floatProd:
regs[ra].intVal = product
elif 32.0 * abs(resAsFloat - floatProd) <= abs(floatProd):
regs[ra].intVal = product
else:
stackTrace(c, tos, pc, errOverOrUnderflow)
of opcDivInt: of opcDivInt:
decodeBC(rkInt) decodeBC(rkInt)
if regs[rc].intVal == 0: stackTrace(c, tos, pc, errConstantDivisionByZero) if regs[rc].intVal == 0: stackTrace(c, tos, pc, errConstantDivisionByZero)
@ -632,7 +671,11 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
of opcUnaryMinusInt: of opcUnaryMinusInt:
decodeB(rkInt) decodeB(rkInt)
assert regs[rb].kind == rkInt assert regs[rb].kind == rkInt
regs[ra].intVal = -regs[rb].intVal let val = regs[rb].intVal
if val != int64.low:
regs[ra].intVal = -val
else:
stackTrace(c, tos, pc, errOverOrUnderflow)
of opcUnaryMinusFloat: of opcUnaryMinusFloat:
decodeB(rkFloat) decodeB(rkFloat)
assert regs[rb].kind == rkFloat assert regs[rb].kind == rkFloat