summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLuke T. Shumaker <lukeshu@lukeshu.com>2025-02-10 00:06:34 -0700
committerLuke T. Shumaker <lukeshu@lukeshu.com>2025-02-10 00:06:34 -0700
commit6cd125e1ffd44fdf62c44d22c519561a8c9d7268 (patch)
treebf2b4a8225fe0d6f00084a1577c70bb564a20600 /build-aux
parentf466cff948ec638f26a9a77a391904ebe03c4dfb (diff)
parenta51875001eb672d73c9d84d44bb32abce327b931 (diff)
Merge branch 'lukeshu/libobj-simple'
Diffstat (limited to 'build-aux')
-rwxr-xr-xbuild-aux/stack.c.gen18
1 files changed, 9 insertions, 9 deletions
diff --git a/build-aux/stack.c.gen b/build-aux/stack.c.gen
index 2a23565..e327298 100755
--- a/build-aux/stack.c.gen
+++ b/build-aux/stack.c.gen
@@ -353,7 +353,7 @@ def main(
# The sbc-harness codebase #######################################
- vcalls: dict[str, set[str]] = {}
+ objcalls: dict[str, set[str]] = {}
re_vtable_start = re.compile(r"_vtable\s*=\s*\{")
re_vtable_entry = re.compile(r"^\s+\.(?P<meth>\S+)\s*=\s*(?P<impl>\S+),.*")
for fname in c_fnames:
@@ -367,9 +367,9 @@ def main(
impl = m.group("impl")
if impl == "NULL":
continue
- if m.group("meth") not in vcalls:
- vcalls[meth] = set()
- vcalls[meth].add(impl)
+ if m.group("meth") not in objcalls:
+ objcalls[meth] = set()
+ objcalls[meth].add(impl)
if "}" in line:
in_vtable = False
elif re_vtable_start.search(line):
@@ -401,15 +401,15 @@ def main(
typ = m.group("typ")
lib9p_msgs.add(typ)
- re_call_vcall = re.compile(r"VCALL\((?P<obj>[^,]+), (?P<meth>[^,)]+)[,)].*")
+ re_call_objcall = re.compile(r"LO_CALL\((?P<obj>[^,]+), (?P<meth>[^,)]+)[,)].*")
def sbc_indirect_callees(loc: str, line: str) -> list[str] | None:
if "/3rd-party/" in loc:
return None
- if m := re_call_vcall.fullmatch(line):
- if m.group("meth") in vcalls:
- return sorted(vcalls[m.group("meth")])
- return [f"__indirect_call:{m.group('obj')}->vtable->{m.group('meth')}"]
+ if m := re_call_objcall.fullmatch(line):
+ if m.group("meth") in objcalls:
+ return sorted(objcalls[m.group("meth")])
+ return [f"__indirect_call:{m.group('obj')}.vtable->{m.group('meth')}"]
if "trigger->cb(trigger->cb_arg)" in line:
return [
"alarmclock_sleep_intrhandler",