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

fixes nimrtl compilation

Browse source
This commit is contained in:
Zahary Karadjov 2013-01-28 00:47:41 +02:00
commit 0cb95891d3
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/nimbase.h
View file

@ -438,11 +438,11 @@ struct TFrame {
#define nimfr(proc, file) \ #define nimfr(proc, file) \
volatile TFrame F; \ volatile TFrame F; \
F.procname = proc; F.filename = file; F.line = 0; F.len = 0; pushFrame(&F); F.procname = proc; F.filename = file; F.line = 0; F.len = 0; nimFrame(&F);
#define nimfrs(proc, file, slots) \ #define nimfrs(proc, file, slots) \
volatile struct {TFrame* prev;NCSTRING procname;NI line;NCSTRING filename; NI len; TVarSlot s[slots];} F; \ volatile struct {TFrame* prev;NCSTRING procname;NI line;NCSTRING filename; NI len; TVarSlot s[slots];} F; \
F.procname = proc; F.filename = file; F.line = 0; F.len = slots; pushFrame((TFrame*)&F); F.procname = proc; F.filename = file; F.line = 0; F.len = slots; nimFrame((TFrame*)&F);
#define nimln(n, file) \ #define nimln(n, file) \
F.line = n; F.filename = file; F.line = n; F.filename = file;

2
lib/system/embedded.nim
View file

@ -17,7 +17,7 @@ proc chckRange(i, a, b: int): int {.inline, compilerproc.}
proc chckRangeF(x, a, b: float): float {.inline, compilerproc.} proc chckRangeF(x, a, b: float): float {.inline, compilerproc.}
proc chckNil(p: pointer) {.inline, compilerproc.} proc chckNil(p: pointer) {.inline, compilerproc.}
proc pushFrame(s: PFrame) {.compilerRtl, inl.} = nil proc pushFrame(s: PFrame) {.compilerRtl, inl, exportc: "nimFrame".} = nil
proc popFrame {.compilerRtl, inl.} = nil proc popFrame {.compilerRtl, inl.} = nil
proc setFrame(s: PFrame) {.compilerRtl, inl.} = nil proc setFrame(s: PFrame) {.compilerRtl, inl.} = nil

2
lib/system/excpt.nim
View file

@ -41,7 +41,7 @@ var
# a global variable for the root of all try blocks # a global variable for the root of all try blocks
currException {.rtlThreadVar.}: ref E_Base currException {.rtlThreadVar.}: ref E_Base
proc pushFrame(s: PFrame) {.compilerRtl, inl.} = proc pushFrame(s: PFrame) {.compilerRtl, inl, exportc: "nimFrame".} =
s.prev = framePtr s.prev = framePtr
framePtr = s framePtr = s