summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorEXetoC <exetoc@gmail.com>2014-05-04 16:07:37 +0200
committerEXetoC <exetoc@gmail.com>2014-05-04 16:07:37 +0200
commit8d19b099595561d42bf1206c5488cfeaa08ebadb (patch)
treeafb294e6479570a2dcd5305ace99a15b08af1381
parent05712fe8053420ecf481757e529a7ef2f32fb75c (diff)
downloadNim-8d19b099595561d42bf1206c5488cfeaa08ebadb.tar.gz
noStackFrame -> asmNoStackFrame
-rw-r--r--doc/manual.txt2
-rw-r--r--doc/nimrodc.txt2
-rw-r--r--lib/pure/osproc.nim2
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual.txt b/doc/manual.txt
index 39e2bad2a..1af2a3117 100644
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -2335,7 +2335,7 @@ Nimrod identifiers shall be enclosed in a special character which can be
 specified in the statement's pragmas. The default special character is ``'`'``:
 
 .. code-block:: nimrod
-  proc addInt(a, b: int): int {.noStackFrame.} =
+  proc addInt(a, b: int): int {.asmNoStackFrame.} =
     # a in eax, and b in edx
     asm """
         mov eax, `a`
diff --git a/doc/nimrodc.txt b/doc/nimrodc.txt
index 52e0a6eaf..bde950982 100644
--- a/doc/nimrodc.txt
+++ b/doc/nimrodc.txt
@@ -360,7 +360,7 @@ Example:
   static int cvariable = 420;

   """.}

 

-  proc embedsC() {.noStackFrame.} = 

+  proc embedsC() {.asmNoStackFrame.} = 

     var nimrodVar = 89

     # use backticks to access Nimrod symbols within an emit section:

     {.emit: """fprintf(stdout, "%d\n", cvariable + (int)`nimrodVar`);""".}

diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim
index 6e250f9d5..bab26bb45 100644
--- a/lib/pure/osproc.nim
+++ b/lib/pure/osproc.nim
@@ -801,7 +801,7 @@ elif not defined(useNimRtl):
   proc startProcessAfterFork(data: ptr TStartProcessData) =
     # Warning: no GC here!
     # Or anythink that touches global structures - all called nimrod procs
-    # must be marked with noStackFrame. Inspect C code after making changes.
+    # must be marked with asmNoStackFrame. Inspect C code after making changes.
     if not data.optionPoParentStreams:
       discard close(data.pStdin[writeIdx])
       if dup2(data.pStdin[readIdx], readIdx) < 0: