mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-29 17:34:43 +00:00
* squashed work by Zahary
* squashing a ton of useful history... otherwise rebasing on top of upstream Nim after commit 82c009a2cb would be impossible.
* Code review changes; Working test suite (without code reloading enabled)
* - documentation
- implemented the HCR test - almost works...
- fix the issue on Unix where for executable targets the source file for the main module of a project in nimcache was being overwritten with the binary itself (and thus the actual source code was lost)
- fixing embedded paths to shared objects on unix (the "lib" prefix was being prepended to the entire path instead of just the filename)
- other fixes
- removing unnecessary includes since that file is already included in chcks.nim which is in turn included in system.nim (and previously was getting imported in chcks.nim but then system.nim improts something... and that breaks HCR (perhaps it could be fixed but it would be nice not to import anything in system))
* fix for clang & C++ - explicitly casting a function pointer to void*
more stable mangling of parameter names when HCR is on
the length of the static arrays in the DatInit functions is now part of the name of the variables, so when they get resized they get also recreated
more stable mangling for inline functions - no longer depends on the module which first used them
work on the new complicated HCR test - turned surprisingly complex - WIP
test now successfully passes even when re-running `koch test` (previously when the nimcache wasn't cold that lead to errors)
better documentation
calling setStackBottomWith for PreMain
passes over the HcrInit/DatInit/Init calls of all modules are now in the proper order (first all of one type, then all of the next). Also typeinfo globals are registered (created) in a single pass before the DatInit pass (because of the way generic instantiations are handled)
Fix the test suite execution on macOs
fix for being able to query the program arguments when using HCR on posix!
other fixes
* Bugfix: Fix a compilation error in C++ mode when a function pointer
is converted to a raw pointer
* basic documentation for the new hot code reloading semantics
* Add change log entry
* Don't re-execute the top-level statements while reloading JS code
* fix a number of tests broken in a recent bugfix
* Review changes
* Added {.executeOnReload.} pragma that indicates top-level statements
that should be executed on each reload. To make this work, I've modified
the way the `if (hcr_init_) {...}` guards are produced in the init code.
This still needs more work as the new guards seem to be inserted within
the previously generated guards.
This change also removes the need for `lastRegistedGlobal` in nimhcr.
* Implemented the `signatureHash` magic and the `hasModuleChanged` API
depending on it (the actual logic is not imlemented yet).
* Add the "hcr" prefix to all HCR-related symbols in the system module.
Added a new `hotcodereloading` module exporting the high-level API to
the user.
Besides being more hygienic, this was also required in order to make
it possible to use macros in the high-level API. Without the split,
`system` would have to import `macros`, which was going to produce
the well-known init problems.
* Attempted to solve the "GC markers problem".
Crashes were expected with the previous code, because the GC markers
were compiled as normal procs are registered in the GC. When their
module is unloaded, dangling pointers will remain in the GC tables.
To solve this issue, I don't register any GC markers when HCR is on,
but I add them to the HCR globals metadata and I use a single marker
registed in nimhcr during the initialization of the system module that
will be responsible for marking all globals.
* fix a compilation error
* - implemented the hasModuleChanged functionality
- tuples can be returned and broken into different vars in global scope
- added comments for the closnig scopes of the if statements in the init proc
- the new executeOnReload pragma works now!
- other fixes
* finally! fixing this hack in a proper way - declaring the destructor out of line (out of the class body) - we no longer need to forward-declare popCurrentExceptionEx
* Force full module parsing
This is a temporary hack that breaks some tests. I'll investigate
later how these can be fixed.
* tuples are now properly handled when global!
* these comments mess up the codegen in debug mode when $n is not actually a new line (or something like that) - these labels are intended only for GOTO labels anyway...
* "solved" the issue with the .pdb locks on windows when a binary is being debugged and hot code reloading is used at the same time
* fixes after rebasing...
* small fixes for the test
* better handling of globals! no more compiler crashes for locals with the global pragma, also simplified code around loops in global scope which have local vars (actually globals)
* we can now use the global pragma even for ... globals!
* the right output
* lets try those boehm GC tests
* after the test is ran it will be at its starting state - no git modifications
* clarification in the docs
* removed unnecessary line directives for forward declarations of functions - they were causing trouble with hot code reloading when no semantic change propagates to the main module but a line directive got changed and thus the main module had to be recompiled since the .c code had changed
* fixed bug! was inserting duplicate keys into the table and later was removing only 1 copy of all the duplicates (after a few reloads)
* no longer breaking into DatInit code when not supposed to
* fixes after rebasing
* yet more fixes after rebasing
* Update jssys.nim
* Rework the HCR path-handling logic
After reviewing the code more carefully, I've noticed that the old logic
will be broken when the user overrides the '--out:f' compiler option.
Besides fixing this issues, I took the opportunity to implement the
missing '--outdir:d' option.
Other changes:
* ./koch test won't overwrite any HCR and RTL builds located in nim/lib
* HCR and RTL are compiled with --threads:on by default
* Clean up the globals registration logic
* Handle non-flattened top-level stmtlists in JS as well
* The HCR is not supported with the Boehm GC yet
Also fixes some typos and the expected output of the HCR integration test
* The GC marker procs are now properly used as trampolines
* Fix the HCR integration test in release builds
* Fix ./koch tools
* this forward declaration doesn't seem to be necessary, and in fact breaks HCR because a 2nd function pointer is emitted for this externed/rtl func
* the forward declaration I removed in the last commit was actually necessary
* Attempt to make all tests green
* Fix tgenscript
* BAT file for running the HCR integration test on Windows [skip ci]
* Fix the docgen tests
* A final fix for Travis (hopefully)
263 lines
8.3 KiB
Nim
263 lines
8.3 KiB
Nim
#
|
|
#
|
|
# The Nim Compiler
|
|
# (c) Copyright 2013 Andreas Rumpf
|
|
#
|
|
# See the file "copying.txt", included in this
|
|
# distribution, for details about the copyright.
|
|
#
|
|
|
|
## This module contains the type definitions for the new evaluation engine.
|
|
## An instruction is 1-3 int32s in memory, it is a register based VM.
|
|
|
|
import ast, passes, msgs, idents, intsets, options, modulegraphs, lineinfos,
|
|
tables, btrees
|
|
|
|
const
|
|
byteExcess* = 128 # we use excess-K for immediates
|
|
wordExcess* = 32768
|
|
|
|
MaxLoopIterations* = 3_000_000 # max iterations of all loops
|
|
|
|
|
|
type
|
|
TRegister* = range[0..255]
|
|
TDest* = range[-1 .. 255]
|
|
TInstr* = distinct uint32
|
|
|
|
TOpcode* = enum
|
|
opcEof, # end of code
|
|
opcRet, # return
|
|
opcYldYoid, # yield with no value
|
|
opcYldVal, # yield with a value
|
|
|
|
opcAsgnInt,
|
|
opcAsgnStr,
|
|
opcAsgnFloat,
|
|
opcAsgnRef,
|
|
opcAsgnIntFromFloat32, # int and float must be of the same byte size
|
|
opcAsgnIntFromFloat64, # int and float must be of the same byte size
|
|
opcAsgnFloat32FromInt, # int and float must be of the same byte size
|
|
opcAsgnFloat64FromInt, # int and float must be of the same byte size
|
|
opcAsgnComplex,
|
|
opcNodeToReg,
|
|
|
|
opcLdArr, # a = b[c]
|
|
opcWrArr, # a[b] = c
|
|
opcLdObj, # a = b.c
|
|
opcWrObj, # a.b = c
|
|
opcAddrReg,
|
|
opcAddrNode,
|
|
opcLdDeref,
|
|
opcWrDeref,
|
|
opcWrStrIdx,
|
|
opcLdStrIdx, # a = b[c]
|
|
|
|
opcAddInt,
|
|
opcAddImmInt,
|
|
opcSubInt,
|
|
opcSubImmInt,
|
|
opcLenSeq,
|
|
opcLenStr,
|
|
|
|
opcIncl, opcInclRange, opcExcl, opcCard, opcMulInt, opcDivInt, opcModInt,
|
|
opcAddFloat, opcSubFloat, opcMulFloat, opcDivFloat,
|
|
opcShrInt, opcShlInt, opcAshrInt,
|
|
opcBitandInt, opcBitorInt, opcBitxorInt, opcAddu, opcSubu, opcMulu,
|
|
opcDivu, opcModu, opcEqInt, opcLeInt, opcLtInt, opcEqFloat,
|
|
opcLeFloat, opcLtFloat, opcLeu, opcLtu,
|
|
opcEqRef, opcEqNimNode, opcSameNodeType,
|
|
opcXor, opcNot, opcUnaryMinusInt, opcUnaryMinusFloat, opcBitnotInt,
|
|
opcEqStr, opcLeStr, opcLtStr, opcEqSet, opcLeSet, opcLtSet,
|
|
opcMulSet, opcPlusSet, opcMinusSet, opcSymdiffSet, opcConcatStr,
|
|
opcContainsSet, opcRepr, opcSetLenStr, opcSetLenSeq,
|
|
opcIsNil, opcOf, opcIs,
|
|
opcSubStr, opcParseFloat, opcConv, opcCast,
|
|
opcQuit,
|
|
opcNarrowS, opcNarrowU,
|
|
opcSignExtend,
|
|
|
|
opcAddStrCh,
|
|
opcAddStrStr,
|
|
opcAddSeqElem,
|
|
opcRangeChck,
|
|
|
|
opcNAdd,
|
|
opcNAddMultiple,
|
|
opcNKind,
|
|
opcNSymKind,
|
|
opcNIntVal,
|
|
opcNFloatVal,
|
|
opcNSymbol,
|
|
opcNIdent,
|
|
opcNGetType,
|
|
opcNStrVal,
|
|
opcNSigHash,
|
|
|
|
opcNSetIntVal,
|
|
opcNSetFloatVal, opcNSetSymbol, opcNSetIdent, opcNSetType, opcNSetStrVal,
|
|
opcNNewNimNode, opcNCopyNimNode, opcNCopyNimTree, opcNDel, opcGenSym,
|
|
|
|
opcNccValue, opcNccInc, opcNcsAdd, opcNcsIncl, opcNcsLen, opcNcsAt,
|
|
opcNctPut, opcNctLen, opcNctGet, opcNctHasNext, opcNctNext,
|
|
|
|
opcSlurp,
|
|
opcGorge,
|
|
opcParseExprToAst,
|
|
opcParseStmtToAst,
|
|
opcQueryErrorFlag,
|
|
opcNError,
|
|
opcNWarning,
|
|
opcNHint,
|
|
opcNGetLineInfo, opcNSetLineInfo,
|
|
opcEqIdent,
|
|
opcStrToIdent,
|
|
opcGetImpl,
|
|
opcGetImplTransf
|
|
|
|
opcEcho,
|
|
opcIndCall, # dest = call regStart, n; where regStart = fn, arg1, ...
|
|
opcIndCallAsgn, # dest = call regStart, n; where regStart = fn, arg1, ...
|
|
|
|
opcRaise,
|
|
opcNChild,
|
|
opcNSetChild,
|
|
opcCallSite,
|
|
opcNewStr,
|
|
|
|
opcTJmp, # jump Bx if A != 0
|
|
opcFJmp, # jump Bx if A == 0
|
|
opcJmp, # jump Bx
|
|
opcJmpBack, # jump Bx; resulting from a while loop
|
|
opcBranch, # branch for 'case'
|
|
opcTry,
|
|
opcExcept,
|
|
opcFinally,
|
|
opcFinallyEnd,
|
|
opcNew,
|
|
opcNewSeq,
|
|
opcLdNull, # dest = nullvalue(types[Bx])
|
|
opcLdNullReg,
|
|
opcLdConst, # dest = constants[Bx]
|
|
opcAsgnConst, # dest = copy(constants[Bx])
|
|
opcLdGlobal, # dest = globals[Bx]
|
|
opcLdGlobalAddr, # dest = addr(globals[Bx])
|
|
|
|
opcLdImmInt, # dest = immediate value
|
|
opcNBindSym, opcNDynBindSym,
|
|
opcSetType, # dest.typ = types[Bx]
|
|
opcTypeTrait,
|
|
opcMarshalLoad, opcMarshalStore,
|
|
opcToNarrowInt,
|
|
opcSymOwner,
|
|
opcSymIsInstantiationOf
|
|
|
|
TBlock* = object
|
|
label*: PSym
|
|
fixups*: seq[TPosition]
|
|
|
|
TEvalMode* = enum ## reason for evaluation
|
|
emRepl, ## evaluate because in REPL mode
|
|
emConst, ## evaluate for 'const' according to spec
|
|
emOptimize, ## evaluate for optimization purposes (same as
|
|
## emConst?)
|
|
emStaticExpr, ## evaluate for enforced compile time eval
|
|
## ('static' context)
|
|
emStaticStmt ## 'static' as an expression
|
|
|
|
TSandboxFlag* = enum ## what the evaluation engine should allow
|
|
allowCast, ## allow unsafe language feature: 'cast'
|
|
allowInfiniteLoops ## allow endless loops
|
|
TSandboxFlags* = set[TSandboxFlag]
|
|
|
|
TSlotKind* = enum # We try to re-use slots in a smart way to
|
|
# minimize allocations; however the VM supports arbitrary
|
|
# temporary slot usage. This is required for the parameter
|
|
# passing implementation.
|
|
slotEmpty, # slot is unused
|
|
slotFixedVar, # slot is used for a fixed var/result (requires copy then)
|
|
slotFixedLet, # slot is used for a fixed param/let
|
|
slotTempUnknown, # slot but type unknown (argument of proc call)
|
|
slotTempInt, # some temporary int
|
|
slotTempFloat, # some temporary float
|
|
slotTempStr, # some temporary string
|
|
slotTempComplex, # some complex temporary (s.node field is used)
|
|
slotTempPerm # slot is temporary but permanent (hack)
|
|
|
|
PProc* = ref object
|
|
blocks*: seq[TBlock] # blocks; temp data structure
|
|
sym*: PSym
|
|
slots*: array[TRegister, tuple[inUse: bool, kind: TSlotKind]]
|
|
maxSlots*: int
|
|
|
|
VmArgs* = object
|
|
ra*, rb*, rc*: Natural
|
|
slots*: pointer
|
|
currentException*: PNode
|
|
currentLineInfo*: TLineInfo
|
|
VmCallback* = proc (args: VmArgs) {.closure.}
|
|
|
|
PCtx* = ref TCtx
|
|
TCtx* = object of TPassContext # code gen context
|
|
code*: seq[TInstr]
|
|
debug*: seq[TLineInfo] # line info for every instruction; kept separate
|
|
# to not slow down interpretation
|
|
globals*: PNode #
|
|
constants*: PNode # constant data
|
|
types*: seq[PType] # some instructions reference types (e.g. 'except')
|
|
currentExceptionA*, currentExceptionB*: PNode
|
|
exceptionInstr*: int # index of instruction that raised the exception
|
|
prc*: PProc
|
|
module*: PSym
|
|
callsite*: PNode
|
|
mode*: TEvalMode
|
|
features*: TSandboxFlags
|
|
traceActive*: bool
|
|
loopIterations*: int
|
|
comesFromHeuristic*: TLineInfo # Heuristic for better macro stack traces
|
|
callbacks*: seq[tuple[key: string, value: VmCallback]]
|
|
errorFlag*: string
|
|
cache*: IdentCache
|
|
config*: ConfigRef
|
|
graph*: ModuleGraph
|
|
oldErrorCount*: int
|
|
|
|
TPosition* = distinct int
|
|
|
|
PEvalContext* = PCtx
|
|
|
|
proc newCtx*(module: PSym; cache: IdentCache; g: ModuleGraph): PCtx =
|
|
PCtx(code: @[], debug: @[],
|
|
globals: newNode(nkStmtListExpr), constants: newNode(nkStmtList), types: @[],
|
|
prc: PProc(blocks: @[]), module: module, loopIterations: MaxLoopIterations,
|
|
comesFromHeuristic: unknownLineInfo(), callbacks: @[], errorFlag: "",
|
|
cache: cache, config: g.config, graph: g)
|
|
|
|
proc refresh*(c: PCtx, module: PSym) =
|
|
c.module = module
|
|
c.prc = PProc(blocks: @[])
|
|
c.loopIterations = MaxLoopIterations
|
|
|
|
proc registerCallback*(c: PCtx; name: string; callback: VmCallback): int {.discardable.} =
|
|
result = c.callbacks.len
|
|
c.callbacks.add((name, callback))
|
|
|
|
const
|
|
firstABxInstr* = opcTJmp
|
|
largeInstrs* = { # instructions which use 2 int32s instead of 1:
|
|
opcSubStr, opcConv, opcCast, opcNewSeq, opcOf,
|
|
opcMarshalLoad, opcMarshalStore}
|
|
slotSomeTemp* = slotTempUnknown
|
|
relativeJumps* = {opcTJmp, opcFJmp, opcJmp, opcJmpBack}
|
|
|
|
# flag is used to signal opcSeqLen if node is NimNode.
|
|
const nimNodeFlag* = 16
|
|
|
|
template opcode*(x: TInstr): TOpcode = TOpcode(x.uint32 and 0xff'u32)
|
|
template regA*(x: TInstr): TRegister = TRegister(x.uint32 shr 8'u32 and 0xff'u32)
|
|
template regB*(x: TInstr): TRegister = TRegister(x.uint32 shr 16'u32 and 0xff'u32)
|
|
template regC*(x: TInstr): TRegister = TRegister(x.uint32 shr 24'u32)
|
|
template regBx*(x: TInstr): int = (x.uint32 shr 16'u32).int
|
|
|
|
template jmpDiff*(x: TInstr): int = regBx(x) - wordExcess
|