diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/main.nim | 2 | ||||
| -rw-r--r-- | compiler/nimeval.nim | 2 | ||||
| -rw-r--r-- | compiler/platform.nim | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/compiler/main.nim b/compiler/main.nim index 2489b1c50..aa0cc9b39 100644 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -100,8 +100,6 @@ proc commandCompileToJS(graph: ModuleGraph; cache: IdentCache) = compileProject(graph, cache) proc interactivePasses(graph: ModuleGraph; cache: IdentCache) = - #incl(gGlobalOptions, optSafeCode) - #setTarget(osNimrodVM, cpuNimrodVM) initDefines(graph.config.symbols) defineSymbol(graph.config.symbols, "nimscript") when hasFFI: defineSymbol(graph.config.symbols, "nimffi") diff --git a/compiler/nimeval.nim b/compiler/nimeval.nim index ff91861d0..714efcdda 100644 --- a/compiler/nimeval.nim +++ b/compiler/nimeval.nim @@ -19,7 +19,7 @@ proc execute*(program: string) = loadConfigs(DefaultConfig) initDefines() - defineSymbol("nimrodvm") + defineSymbol("nimvm") defineSymbol("nimscript") when hasFFI: defineSymbol("nimffi") registerPass(verbosePass) diff --git a/compiler/platform.nim b/compiler/platform.nim index 173cfa8e3..0db16f26c 100644 --- a/compiler/platform.nim +++ b/compiler/platform.nim @@ -22,7 +22,7 @@ type osNone, osDos, osWindows, osOs2, osLinux, osMorphos, osSkyos, osSolaris, osIrix, osNetbsd, osFreebsd, osOpenbsd, osDragonfly, osAix, osPalmos, osQnx, osAmiga, osAtari, osNetware, osMacos, osMacosx, osHaiku, osAndroid, osVxworks - osGenode, osJS, osNimrodVM, osStandalone + osGenode, osJS, osNimVM, osStandalone type TInfoOSProp* = enum @@ -162,7 +162,7 @@ const pathSep: ":", dirSep: "/", scriptExt: ".sh", curDir: ".", exeExt: "", extSep: ".", props: {}), - (name: "NimrodVM", parDir: "..", dllFrmt: "lib$1.so", altDirSep: "/", + (name: "NimVM", parDir: "..", dllFrmt: "lib$1.so", altDirSep: "/", objExt: ".o", newLine: "\x0A", pathSep: ":", dirSep: "/", scriptExt: ".sh", curDir: ".", exeExt: "", extSep: ".", props: {}), (name: "Standalone", parDir: "..", dllFrmt: "lib$1.so", altDirSep: "/", @@ -175,7 +175,7 @@ type # alias conditionals to condsyms (end of module). cpuNone, cpuI386, cpuM68k, cpuAlpha, cpuPowerpc, cpuPowerpc64, cpuPowerpc64el, cpuSparc, cpuVm, cpuIa64, cpuAmd64, cpuMips, cpuMipsel, - cpuArm, cpuArm64, cpuJS, cpuNimrodVM, cpuAVR, cpuMSP430, cpuSparc64, + cpuArm, cpuArm64, cpuJS, cpuNimVM, cpuAVR, cpuMSP430, cpuSparc64, cpuMips64, cpuMips64el, cpuRiscV64 type @@ -202,7 +202,7 @@ const (name: "arm", intSize: 32, endian: littleEndian, floatSize: 64, bit: 32), (name: "arm64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64), (name: "js", intSize: 32, endian: bigEndian,floatSize: 64,bit: 32), - (name: "nimrodvm", intSize: 32, endian: bigEndian, floatSize: 64, bit: 32), + (name: "nimvm", intSize: 32, endian: bigEndian, floatSize: 64, bit: 32), (name: "avr", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16), (name: "msp430", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16), (name: "sparc64", intSize: 64, endian: bigEndian, floatSize: 64, bit: 64), |