Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cbuilder: abstract over unmangled C identifiers #24454

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

cbuilder: abstract over unmangled C identifiers #24454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e169f
cbuilder: abstract over unmangled C identifiers
metagn Nov 18, 2024
05ef47d
Update compiler/cbuilderbase.nim
Araq Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions compiler/cbuilderbase.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ proc cIntType*(bits: int): Snippet =
proc cUintType*(bits: int): Snippet =
"NU" & $bits

template cSymbol*(name: string): Snippet =
## a symbol `name` imported from C, unmangled
name

type
IfBuilderState* = enum
WaitingIf, WaitingElseIf, InBlock
Expand Down
4 changes: 2 additions & 2 deletions compiler/ccgexprs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,7 +1393,7 @@ proc genEcho(p: BProc, n: PNode) =
p.module.includeHeader("<base/log.h>")
p.module.includeHeader("<util/string.h>")
var a: TLoc
let logName = "Genode::log"
let logName = cSymbol("Genode::log")
var logCall: CallBuilder
p.s(cpsStmts).addStmt():
p.s(cpsStmts).addCall(logCall, logName):
Expand All @@ -1404,7 +1404,7 @@ proc genEcho(p: BProc, n: PNode) =
elif n.len != 0:
a = initLocExpr(p, it)
let ra = a.rdLoc
let fnName = "Genode::Cstring"
let fnName = cSymbol("Genode::Cstring")
p.s(cpsStmts).addArgument(logCall):
case detectStrVersion(p.module)
of 2:
Expand Down
4 changes: 2 additions & 2 deletions compiler/ccgstmts.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,10 +1097,10 @@ proc genOrdinalCase(p: BProc, n: PNode, d: var TLoc) =
if not hasDefault:
if hasBuiltinUnreachable in CC[p.config.cCompiler].props:
p.s(cpsStmts).addSwitchElse():
p.s(cpsStmts).addCallStmt("__builtin_unreachable")
p.s(cpsStmts).addCallStmt(cSymbol("__builtin_unreachable"))
elif hasAssume in CC[p.config.cCompiler].props:
p.s(cpsStmts).addSwitchElse():
p.s(cpsStmts).addCallStmt("__assume", cIntValue(0))
p.s(cpsStmts).addCallStmt(cSymbol("__assume"), cIntValue(0))
if lend != "": fixLabel(p, lend)

proc genCase(p: BProc, t: PNode, d: var TLoc) =
Expand Down
30 changes: 15 additions & 15 deletions compiler/cgen.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1712,7 +1712,7 @@ proc genNimMainBody(m: BModule, preMainCode: Snippet) =
genNimMainProc(m, preMainCode)

proc genPosixCMain(m: BModule) =
m.s[cfsProcs].addProcHeader("main", CInt, cProcParams(
m.s[cfsProcs].addProcHeader(cSymbol("main"), CInt, cProcParams(
(name: "argc", typ: CInt),
(name: "args", typ: ptrType(ptrType(CChar))),
(name: "env", typ: ptrType(ptrType(CChar)))))
Expand All @@ -1724,7 +1724,7 @@ proc genPosixCMain(m: BModule) =
m.s[cfsProcs].addNewline()

proc genStandaloneCMain(m: BModule) =
m.s[cfsProcs].addProcHeader("main", CInt, cProcParams())
m.s[cfsProcs].addProcHeader(cSymbol("main"), CInt, cProcParams())
m.s[cfsProcs].finishProcHeaderWithBody():
genMainProcs(m)
m.s[cfsProcs].addReturn(cIntValue(0))
Expand All @@ -1734,10 +1734,10 @@ proc genWinNimMain(m: BModule, preMainCode: Snippet) =
genNimMainBody(m, preMainCode)

proc genWinCMain(m: BModule) =
m.s[cfsProcs].addProcHeader(ccStdCall, "WinMain", CInt, cProcParams(
(name: "hCurInstance", typ: "HINSTANCE"),
(name: "hPrevInstance", typ: "HINSTANCE"),
(name: "lpCmdLine", typ: "LPSTR"),
m.s[cfsProcs].addProcHeader(ccStdCall, cSymbol("WinMain"), CInt, cProcParams(
(name: "hCurInstance", typ: cSymbol("HINSTANCE")),
(name: "hPrevInstance", typ: cSymbol("HINSTANCE")),
(name: "lpCmdLine", typ: cSymbol("LPSTR")),
(name: "nCmdShow", typ: CInt)))
m.s[cfsProcs].finishProcHeaderWithBody():
genMainProcsWithResult(m)
Expand All @@ -1750,12 +1750,12 @@ proc genWinNimDllMain(m: BModule, preMainCode: Snippet) =

proc genWinCDllMain(m: BModule) =
# used to use WINAPI macro, now ccStdCall:
m.s[cfsProcs].addProcHeader(ccStdCall, "DllMain", "BOOL", cProcParams(
(name: "hinstDLL", typ: "HINSTANCE"),
(name: "fwdreason", typ: "DWORD"),
(name: "lpvReserved", typ: "LPVOID")))
m.s[cfsProcs].addProcHeader(ccStdCall, cSymbol("DllMain"), cSymbol("BOOL"), cProcParams(
(name: "hinstDLL", typ: cSymbol("HINSTANCE")),
(name: "fwdreason", typ: cSymbol("DWORD")),
(name: "lpvReserved", typ: cSymbol("LPVOID"))))
m.s[cfsProcs].finishProcHeaderWithBody():
m.s[cfsProcs].addSingleIfStmt(removeSinglePar(cOp(Equal, "fwdreason", "DLL_PROCESS_ATTACH"))):
m.s[cfsProcs].addSingleIfStmt(removeSinglePar(cOp(Equal, "fwdreason", cSymbol("DLL_PROCESS_ATTACH")))):
genMainProcs(m)
m.s[cfsProcs].addReturn(cIntValue(1))
m.s[cfsProcs].addNewline()
Expand All @@ -1771,7 +1771,7 @@ proc genPosixCDllMain(m: BModule) =
m.s[cfsProcs].addNewline()

proc genGenodeNimMain(m: BModule, preMainCode: Snippet) =
let typName = "Genode::Env"
let typName = cSymbol("Genode::Env")
m.s[cfsProcs].addDeclWithVisibility(Extern):
m.s[cfsProcs].addVar(name = "nim_runtime_env", typ = ptrType(typName))
m.s[cfsProcs].addDeclWithVisibility(ExternC):
Expand All @@ -1780,13 +1780,13 @@ proc genGenodeNimMain(m: BModule, preMainCode: Snippet) =
genNimMainBody(m, preMainCode)

proc genComponentConstruct(m: BModule) =
let fnName = "Libc::Component::construct"
let typName = "Libc::Env"
let fnName = cSymbol("Libc::Component::construct")
let typName = cSymbol("Libc::Env")
m.s[cfsProcs].addProcHeader(fnName, CVoid, cProcParams((name: "env", typ: cppRefType(typName))))
m.s[cfsProcs].finishProcHeaderWithBody():
m.s[cfsProcs].addLineComment("Set Env used during runtime initialization")
m.s[cfsProcs].addAssignment("nim_runtime_env", cAddr("env"))
let callFn = "Libc::with_libc"
let callFn = cSymbol("Libc::with_libc")
var call: CallBuilder
m.s[cfsProcs].addStmt():
m.s[cfsProcs].addCall(call, callFn):
Expand Down
Loading