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

Introduce a PreMain proc in the C codegen

Browse source 
The rationale here is that it has become too hard to step into a program
when #line directives are enabled. You have to skip over many lines of init
code that doesn't have corresponding lines in the nimrod program.
Now, you can just step-out of PreMain and go straight to the useful code
in NimMain.
This commit is contained in:
Zahary Karadjov 2013-12-30 11:02:48 +02:00
commit 046d829e5d
2 changed files with 62 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

88
compiler/cgen.nim
View file

@ -945,42 +945,58 @@ proc genFilenames(m: BModule): PRope =
proc genMainProc(m: BModule) = proc genMainProc(m: BModule) =
const const
CommonMainBody = PreMainBody =
"\tsystemDatInit();$n" & "\tsystemDatInit();$n" &
"\tsystemInit();$n" & "\tsystemInit();$n" &
"$1" & "$1" &
"$2" & "$2" &
"$3" & "$3" &
"$4" "$4"
MainProcs =
"\tPreMain();$n" &
"\tNimMain();$n"
MainProcsWithResult =
MainProcs & "\treturn nim_program_result;$n"
PosixNimMain = PosixNimMain =
"int cmdCount;$n" & "int cmdCount;$n" &
"char** cmdLine;$n" & "char** cmdLine;$n" &
"char** gEnv;$n" & "char** gEnv;$n" &
"N_CDECL(void, NimMain)(void) {$n" & "N_CDECL(void, NimMain)(void) {$n$1}$n"
CommonMainBody & "}$n"
PosixCMain = "int main(int argc, char** args, char** env) {$n" & PosixCMain = "int main(int argc, char** args, char** env) {$n" &
"\tcmdLine = args;$n" & "\tcmdCount = argc;$n" & "\tgEnv = env;$n" & "\tcmdLine = args;$n" & "\tcmdCount = argc;$n" & "\tgEnv = env;$n" &
"\tNimMain();$n" & "\treturn nim_program_result;$n" & "}$n" MainProcsWithResult &
"}$n"
StandaloneCMain = "int main(void) {$n" & StandaloneCMain = "int main(void) {$n" &
"\tNimMain();$n" & MainProcs &
"\treturn 0;$n" & "}$n" "\treturn 0;$n" & "}$n"
WinNimMain = "N_CDECL(void, NimMain)(void) {$n" &
CommonMainBody & "}$n" WinNimMain = "N_CDECL(void, NimMain)(void) {$n$1}$n"
WinCMain = "N_STDCALL(int, WinMain)(HINSTANCE hCurInstance, $n" & WinCMain = "N_STDCALL(int, WinMain)(HINSTANCE hCurInstance, $n" &
" HINSTANCE hPrevInstance, $n" & " HINSTANCE hPrevInstance, $n" &
" LPSTR lpCmdLine, int nCmdShow) {$n" & " LPSTR lpCmdLine, int nCmdShow) {$n" &
"\tNimMain();$n" & "\treturn nim_program_result;$n" & "}$n" MainProcsWithResult & "}$n"
WinNimDllMain = "N_LIB_EXPORT N_CDECL(void, NimMain)(void) {$n" &
CommonMainBody & "}$n" WinNimDllMain = "N_LIB_EXPORT N_CDECL(void, NimMain)(void) {$n$1}$n"
WinCDllMain = WinCDllMain =
"BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fwdreason, $n" & "BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fwdreason, $n" &
" LPVOID lpvReserved) {$n" & " LPVOID lpvReserved) {$n" &
"\tif(fwdreason == DLL_PROCESS_ATTACH) NimMain();$n" & "\tif(fwdreason == DLL_PROCESS_ATTACH) {" & MainProcs & "}$n" &
"\treturn 1;$n" & "}$n" "\treturn 1;$n}$n"
PosixNimDllMain = WinNimDllMain PosixNimDllMain = WinNimDllMain
PosixCDllMain = PosixCDllMain =
"void NIM_POSIX_INIT NimMainInit(void) {$n" & "void NIM_POSIX_INIT NimMainInit(void) {$n" &
"\tNimMain();$n}$n" MainProcs &
"}$n"
var nimMain, otherMain: TFormatStr var nimMain, otherMain: TFormatStr
if platform.targetOS == osWindows and if platform.targetOS == osWindows and
gGlobalOptions * {optGenGuiApp, optGenDynLib} != {}: gGlobalOptions * {optGenGuiApp, optGenDynLib} != {}:
@ -1008,8 +1024,10 @@ proc genMainProc(m: BModule) =
platform.targetOS == osStandalone: "".toRope platform.targetOS == osStandalone: "".toRope
else: ropecg(m, "\t#initStackBottom();$n") else: ropecg(m, "\t#initStackBottom();$n")
inc(m.labels) inc(m.labels)
appcg(m, m.s[cfsProcs], nimMain, [mainDatInit, initStackBottomCall, appcg(m, m.s[cfsProcs], "void PreMain() {$n" & PreMainBody & "}$n", [
gBreakpoints, mainModInit, toRope(m.labels)]) mainDatInit, initStackBottomCall, gBreakpoints, otherModsInit])
appcg(m, m.s[cfsProcs], nimMain, [mainModInit, toRope(m.labels)])
if optNoMain notin gGlobalOptions: if optNoMain notin gGlobalOptions:
appcg(m, m.s[cfsProcs], otherMain, []) appcg(m, m.s[cfsProcs], otherMain, [])
@ -1030,9 +1048,13 @@ proc registerModuleToMain(m: PSym) =
"declare void $1() noinline$N", [init]) "declare void $1() noinline$N", [init])
appff(mainModProcs, "N_NOINLINE(void, $1)(void);$N", appff(mainModProcs, "N_NOINLINE(void, $1)(void);$N",
"declare void $1() noinline$N", [datInit]) "declare void $1() noinline$N", [datInit])
if not (sfSystemModule in m.flags): if sfSystemModule notin m.flags:
appff(mainModInit, "\t$1();$n", "call void ()* $1$n", [init])
appff(mainDatInit, "\t$1();$n", "call void ()* $1$n", [datInit]) appff(mainDatInit, "\t$1();$n", "call void ()* $1$n", [datInit])
let initCall = ropeff("\t$1();$n", "call void ()* $1$n", [init])
if sfMainModule in m.flags:
app(mainModInit, initCall)
else:
app(otherModsInit, initCall)
proc genInitCode(m: BModule) = proc genInitCode(m: BModule) =
var initname = getInitName(m.module) var initname = getInitName(m.module)

3
compiler/cgendata.nim
View file

@ -114,7 +114,8 @@ type
injectStmt*: PRope injectStmt*: PRope
var var
mainModProcs*, mainModInit*, mainDatInit*: PRope # parts of the main module mainModProcs*, mainModInit*, otherModsInit*, mainDatInit*: PRope
# varuious parts of the main module
gMapping*: PRope # the generated mapping file (if requested) gMapping*: PRope # the generated mapping file (if requested)
gModules*: seq[BModule] = @[] # list of all compiled modules gModules*: seq[BModule] = @[] # list of all compiled modules
gForwardedProcsCounter*: int = 0 gForwardedProcsCounter*: int = 0