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

Fix vm.nim for --gc:arc (#13741)

Browse source 
* koch boot --gc:arc now passes the nim stage

... but generates invalid C code

* Move it closer to where its used

* Try something else

* Poor mans var

* Use UncheckedArray instead
This commit is contained in:
Clyybber 2020-03-26 16:18:45 +01:00 • committed by GitHub
commit 2925a47ae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

41
compiler/vmhooks.nim
View file

@ -10,10 +10,8 @@
import pathutils
template setX(k, field) {.dirty.} =
var s: seq[TFullReg]
move(s, cast[seq[TFullReg]](a.slots))
s[a.ra].ensureKind(k)
s[a.ra].field = v
a.slots[a.ra].ensureKind(k)
a.slots[a.ra].field = v
proc setResult*(a: VmArgs; v: BiggestInt) = setX(rkInt, intVal)
proc setResult*(a: VmArgs; v: BiggestFloat) = setX(rkFloat, floatVal)
@ -22,45 +20,36 @@ proc setResult*(a: VmArgs; v: bool) =
setX(rkInt, intVal)
proc setResult*(a: VmArgs; v: string) =
var s: seq[TFullReg]
move(s, cast[seq[TFullReg]](a.slots))
s[a.ra].ensureKind(rkNode)
s[a.ra].node = newNode(nkStrLit)
s[a.ra].node.strVal = v
a.slots[a.ra].ensureKind(rkNode)
a.slots[a.ra].node = newNode(nkStrLit)
a.slots[a.ra].node.strVal = v
proc setResult*(a: VmArgs; n: PNode) =
var s: seq[TFullReg]
move(s, cast[seq[TFullReg]](a.slots))
s[a.ra].ensureKind(rkNode)
s[a.ra].node = n
a.slots[a.ra].ensureKind(rkNode)
a.slots[a.ra].node = n
proc setResult*(a: VmArgs; v: AbsoluteDir) = setResult(a, v.string)
proc setResult*(a: VmArgs; v: seq[string]) =
var s: seq[TFullReg]
move(s, cast[seq[TFullReg]](a.slots))
s[a.ra].ensureKind(rkNode)
a.slots[a.ra].ensureKind(rkNode)
var n = newNode(nkBracket)
for x in v: n.add newStrNode(nkStrLit, x)
s[a.ra].node = n
a.slots[a.ra].node = n
template getX(k, field) {.dirty.} =
doAssert i < a.rc-1
let s = cast[seq[TFullReg]](a.slots)
doAssert s[i+a.rb+1].kind == k
result = s[i+a.rb+1].field
doAssert a.slots[i+a.rb+1].kind == k
result = a.slots[i+a.rb+1].field
proc getInt*(a: VmArgs; i: Natural): BiggestInt = getX(rkInt, intVal)
proc getBool*(a: VmArgs; i: Natural): bool = getInt(a, i) != 0
proc getFloat*(a: VmArgs; i: Natural): BiggestFloat = getX(rkFloat, floatVal)
proc getString*(a: VmArgs; i: Natural): string =
doAssert i < a.rc-1
let s = cast[seq[TFullReg]](a.slots)
doAssert s[i+a.rb+1].kind == rkNode
result = s[i+a.rb+1].node.strVal
doAssert a.slots[i+a.rb+1].kind == rkNode
result = a.slots[i+a.rb+1].node.strVal
proc getNode*(a: VmArgs; i: Natural): PNode =
doAssert i < a.rc-1
let s = cast[seq[TFullReg]](a.slots)
doAssert s[i+a.rb+1].kind == rkNode
result = s[i+a.rb+1].node
doAssert a.slots[i+a.rb+1].kind == rkNode
result = a.slots[i+a.rb+1].node