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

fix threading tests

Browse source
This commit is contained in:
Zahary Karadjov 2012-04-15 02:52:09 +03:00
commit 20d56875de
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
compiler/ccgthreadvars.nim
View file

@ -19,8 +19,9 @@ proc AccessThreadLocalVar(p: BProc, s: PSym) =
if emulatedThreadVars() and not p.ThreadVarAccessed: if emulatedThreadVars() and not p.ThreadVarAccessed:
p.ThreadVarAccessed = true p.ThreadVarAccessed = true
p.module.usesThreadVars = true p.module.usesThreadVars = true
appf(p.s(cpsLocals), "NimThreadVars* NimTV;$n") appf(p.procSec(cpsLocals), "NimThreadVars* NimTV;$n")
appcg(p, cpsInit, "NimTV=(NimThreadVars*)#GetThreadLocalVars();$n") app(p.procSec(cpsInit),
ropecg(p.module, "NimTV=(NimThreadVars*)#GetThreadLocalVars();$n"))
var var
nimtv: PRope # nimrod thread vars; the struct body nimtv: PRope # nimrod thread vars; the struct body

9
compiler/cgendata.nim
View file

@ -116,8 +116,13 @@ var
gForwardedProcsCounter*: int = 0 gForwardedProcsCounter*: int = 0
gNimDat*: BModule # generated global data gNimDat*: BModule # generated global data
proc s*(prc: BProc, s: TCProcSection): var PRope {.inline.} = proc s*(p: BProc, s: TCProcSection): var PRope {.inline.} =
result = prc.blocks[prc.blocks.len - 1].sections[s] # section in the current block
result = p.blocks[p.blocks.len - 1].sections[s]
proc procSec*(p: BProc, s: TCProcSection): var PRope {.inline.} =
# top level proc sections
result = p.blocks[0].sections[s]
proc newProc*(prc: PSym, module: BModule): BProc = proc newProc*(prc: PSym, module: BModule): BProc =
new(result) new(result)