mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-02-17 00:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename cast opcodes, fix for 32bit cast, fix python pretty printer (#12207)

Browse Source
This commit is contained in:
Arne Döring
2019-09-18 09:04:37 +02:00
committed by GitHub
parent 93f74e4f93
commit 638a4d9d9f
5 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/vm.nim
View File

@@ -550,19 +550,19 @@ proc rawExecute(c: PCtx, start: int, tos: PStackFrame): TFullReg =
of opcAsgnFloat:
decodeB(rkFloat)
regs[ra].floatVal = regs[rb].floatVal
of opcAsgnIntFromFloat32:
of opcCastFloatToInt32:
let rb = instr.regB
ensureKind(rkInt)
regs[ra].intVal = cast[int32](float32(regs[rb].floatVal))
of opcAsgnIntFromFloat64:
of opcCastFloatToInt64:
let rb = instr.regB
ensureKind(rkInt)
regs[ra].intVal = cast[int64](regs[rb].floatVal)
of opcAsgnFloat32FromInt:
of opcCastIntToFloat32:
let rb = instr.regB
ensureKind(rkFloat)
regs[ra].floatVal = cast[float32](int32(regs[rb].intVal))
of opcAsgnFloat64FromInt:
of opcCastIntToFloat64:
let rb = instr.regB
ensureKind(rkFloat)
regs[ra].floatVal = cast[float64](int64(regs[rb].intVal))

8
compiler/vmdef.nim
View File

@@ -33,11 +33,11 @@ type
opcAsgnInt,
opcAsgnFloat,
opcAsgnRef,
opcAsgnIntFromFloat32, # int and float must be of the same byte size
opcAsgnIntFromFloat64, # int and float must be of the same byte size
opcAsgnFloat32FromInt, # int and float must be of the same byte size
opcAsgnFloat64FromInt, # int and float must be of the same byte size
opcAsgnComplex,
opcCastIntToFloat32, # int and float must be of the same byte size
opcCastIntToFloat64, # int and float must be of the same byte size
opcCastFloatToInt32, # int and float must be of the same byte size
opcCastFloatToInt64, # int and float must be of the same byte size
opcFastAsgnComplex,
opcNodeToReg,

14
compiler/vmgen.nim
View File

@@ -843,9 +843,9 @@ proc genCastIntFloat(c: PCtx; n: PNode; dest: var TDest) =
let tmp = c.genx(n[1])
if dest < 0: dest = c.getTemp(n[0].typ)
if dst.kind == tyFloat32:
c.gABC(n, opcAsgnFloat32FromInt, dest, tmp)
c.gABC(n, opcCastIntToFloat32, dest, tmp)
else:
c.gABC(n, opcAsgnFloat64FromInt, dest, tmp)
c.gABC(n, opcCastIntToFloat64, dest, tmp)
c.freeTemp(tmp)
elif srcSize == dstSize and src.kind in {tyFloat, tyFloat32, tyFloat64} and
@@ -853,11 +853,15 @@ proc genCastIntFloat(c: PCtx; n: PNode; dest: var TDest) =
let tmp = c.genx(n[1])
if dest < 0: dest = c.getTemp(n[0].typ)
if src.kind == tyFloat32:
c.gABC(n, opcAsgnIntFromFloat32, dest, tmp)
c.gABC(n, opcCastFloatToInt32, dest, tmp)
if dst.kind in unsignedIntegers:
# integers are sign extended by default.
# since there is no opcCastFloatToUInt32, narrowing should do the trick.
c.gABC(n, opcNarrowU, dest, TRegister(32))
else:
c.gABC(n, opcAsgnIntFromFloat64, dest, tmp)
c.gABC(n, opcCastFloatToInt64, dest, tmp)
# narrowing for 64 bits not needed (no extended sign bits available).
c.freeTemp(tmp)
else:
globalError(c.config, n.info, "VM is only allowed to 'cast' between integers and/or floats of same size")

13
tests/vm/tcastint.nim
View File

@@ -281,14 +281,27 @@ proc test_float32_cast =
let xf = cast[float32](xx)
doAssert(xf == 16.0'f32, $xf)
proc test_float32_castB() =
let a: float32 = -123.125
let b = cast[int32](a)
let c = cast[uint32](a)
doAssert b == -1024049152
doAssert cast[uint64](b) == 18446744072685502464'u64
doAssert c == 3270918144'u32
# ensure the unsused bits in the internal representation don't have
# any surprising content.
doAssert cast[uint64](c) == 3270918144'u64
test()
test_float_cast()
test_float32_cast()
free_integer_casting()
test_float32_castB()
static:
test()
test_float_cast()
test_float32_cast()
free_integer_casting()
test_float32_castB()
echo "OK"

8
tools/nim-gdb.py
View File

@@ -285,7 +285,7 @@ class NimStringPrinter:
return ""
class NimRopePrinter:
pattern = re.compile(r'^tyObject_RopeObj_OFzf0kSiPTcNreUIeJgWVA \*$')
pattern = re.compile(r'^tyObject_RopeObj__([A-Za-z0-9]*) \*$')
def __init__(self, val):
self.val = val
@@ -398,7 +398,7 @@ class NimSetPrinter:
################################################################################
class NimHashSetPrinter:
pattern = re.compile(r'^tyObject_(HashSet)_([A-Za-z0-9]*)$')
pattern = re.compile(r'^tyObject_(HashSet)__([A-Za-z0-9]*)$')
def __init__(self, val):
self.val = val
@@ -475,7 +475,7 @@ class NimArrayPrinter:
################################################################################
class NimStringTablePrinter:
pattern = re.compile(r'^tyObject_(StringTableObj)_([A-Za-z0-9]*)(:? \*)?$')
pattern = re.compile(r'^tyObject_(StringTableObj)__([A-Za-z0-9]*)(:? \*)?$')
def __init__(self, val):
self.val = val
@@ -504,7 +504,7 @@ class NimStringTablePrinter:
################################################################
class NimTablePrinter:
pattern = re.compile(r'^tyObject_(Table)_([A-Za-z0-9]*)(:? \*)?$')
pattern = re.compile(r'^tyObject_(Table)__([A-Za-z0-9]*)(:? \*)?$')
def __init__(self, val):
self.val = val