Use cabi_ prefix instead of _ and use _ instead if - in post-return function

Author: lukewagner

design/mvp/CanonicalABI.md

@@ -1359,18 +1359,18 @@ def canonical_module_type(ct: ComponentType) -> ModuleType:
     imports.append(CoreImportDecl('', mangle_funcname(name, ft), flat_ft))
 
   exports = []
-  exports.append(CoreExportDecl('_memory', CoreMemoryType(initial=0, maximum=None)))
-  exports.append(CoreExportDecl('_realloc', CoreFuncType(['i32','i32','i32','i32'], ['i32'])))
+  exports.append(CoreExportDecl('cabi_memory', CoreMemoryType(initial=0, maximum=None)))
+  exports.append(CoreExportDecl('cabi_realloc', CoreFuncType(['i32','i32','i32','i32'], ['i32'])))
 
   start_ft = FuncType(start_params, start_results)
-  start_name = mangle_funcname('_start{cabi=' + CABI_VERSION + '}', start_ft)
+  start_name = mangle_funcname('cabi_start{cabi=' + CABI_VERSION + '}', start_ft)
   exports.append(CoreExportDecl(start_name, flatten_functype(start_ft, 'lift')))
 
   for name,ft in export_funcs:
     flat_ft = flatten_functype(ft, 'lift')
     exports.append(CoreExportDecl(mangle_funcname(name, ft), flat_ft))
     if any(contains_dynamic_allocation(t) for t in ft.results):
-      exports.append(CoreExportDecl('_post-' + name, CoreFuncType(flat_ft.results, [])))
+      exports.append(CoreExportDecl('cabi_post_' + name, CoreFuncType(flat_ft.results, [])))
 
   return ModuleType(imports, exports)
 
@@ -1389,15 +1389,15 @@ import/export with the function type mangled into the name. Additionally, each
 export whose return type implies possible dynamic allocation is given a
 `post-return` function so that it can deallocate after the caller reads the
 return value. Lastly, all value imports and exports are concatenated into a
-synthetic `_start` function that is called immediately after instantiation.
+synthetic `cabi_start` function that is called immediately after instantiation.
 
 For imports (which in Core WebAssembly are [two-level]), the first-level name
 is set to be a zero-length string so that the entire rest of the first-level
 string space is available for [shared-everything linking].
 
 For imports and exports, the Canonical ABI assumes that `_` is not a valid
-first character in a component-level import/export (as is currently the case in
-`wit` [identifiers](WIT.md#identifiers)) and thus can safely be used to prefix 
+character in a component-level import/export (as is currently the case in `wit`
+[identifiers](WIT.md#identifiers)) and thus can safely be used to prefix
 auxiliary Canonical ABI-induced imports/exports.
 
 Instance-mangling recursively builds a dotted path string (of instance names)

design/mvp/canonical-abi/definitions.py

@@ -1029,18 +1029,18 @@ def canonical_module_type(ct: ComponentType) -> ModuleType:
     imports.append(CoreImportDecl('', mangle_funcname(name, ft), flat_ft))
 
   exports = []
-  exports.append(CoreExportDecl('_memory', CoreMemoryType(initial=0, maximum=None)))
-  exports.append(CoreExportDecl('_realloc', CoreFuncType(['i32','i32','i32','i32'], ['i32'])))
+  exports.append(CoreExportDecl('cabi_memory', CoreMemoryType(initial=0, maximum=None)))
+  exports.append(CoreExportDecl('cabi_realloc', CoreFuncType(['i32','i32','i32','i32'], ['i32'])))
 
   start_ft = FuncType(start_params, start_results)
-  start_name = mangle_funcname('_start{cabi=' + CABI_VERSION + '}', start_ft)
+  start_name = mangle_funcname('cabi_start{cabi=' + CABI_VERSION + '}', start_ft)
   exports.append(CoreExportDecl(start_name, flatten_functype(start_ft, 'lift')))
 
   for name,ft in export_funcs:
     flat_ft = flatten_functype(ft, 'lift')
     exports.append(CoreExportDecl(mangle_funcname(name, ft), flat_ft))
     if any(contains_dynamic_allocation(t) for t in ft.results):
-      exports.append(CoreExportDecl('_post-' + name, CoreFuncType(flat_ft.results, [])))
+      exports.append(CoreExportDecl('cabi_post_' + name, CoreFuncType(flat_ft.results, [])))
 
   return ModuleType(imports, exports)
 

design/mvp/canonical-abi/run_tests.py

@@ -409,9 +409,9 @@ def test_cabi(ct, expect):
   ),
   ModuleType(
     [CoreImportDecl('','a: func u8 -> u8', CoreFuncType(['i32'],['i32']))],
-    [CoreExportDecl('_memory', CoreMemoryType(0, None)),
-     CoreExportDecl('_realloc', CoreFuncType(['i32','i32','i32','i32'],['i32'])),
-     CoreExportDecl('_start{cabi=0.1}: func (b:string) -> (d:list<u8>)',
+    [CoreExportDecl('cabi_memory', CoreMemoryType(0, None)),
+     CoreExportDecl('cabi_realloc', CoreFuncType(['i32','i32','i32','i32'],['i32'])),
+     CoreExportDecl('cabi_start{cabi=0.1}: func (b:string) -> (d:list<u8>)',
                     CoreFuncType(['i32','i32'],['i32'])),
      CoreExportDecl('c: func s8 -> s8', CoreFuncType(['i32'],['i32']))]
   )
@@ -429,12 +429,12 @@ def test_cabi(ct, expect):
   ),
   ModuleType(
     [CoreImportDecl('','a.b: func u8 -> u8', CoreFuncType(['i32'],['i32']))],
-    [CoreExportDecl('_memory', CoreMemoryType(0, None)),
-     CoreExportDecl('_realloc', CoreFuncType(['i32','i32','i32','i32'],['i32'])),
-     CoreExportDecl('_start{cabi=0.1}: func (a.c:float32) -> (d.f:float64)',
+    [CoreExportDecl('cabi_memory', CoreMemoryType(0, None)),
+     CoreExportDecl('cabi_realloc', CoreFuncType(['i32','i32','i32','i32'],['i32'])),
+     CoreExportDecl('cabi_start{cabi=0.1}: func (a.c:float32) -> (d.f:float64)',
                     CoreFuncType(['f32'],['f64'])),
      CoreExportDecl('d.e: func () -> list<string>', CoreFuncType([],['i32'])),
-     CoreExportDecl('_post-d.e', CoreFuncType(['i32'],[]))]
+     CoreExportDecl('cabi_post_d.e', CoreFuncType(['i32'],[]))]
   )
 )
 test_cabi( # from CanonicalABI.md
@@ -450,12 +450,12 @@ def test_cabi(ct, expect):
   ModuleType(
     [CoreImportDecl('','foo: func () -> ()', CoreFuncType([],[])),
      CoreImportDecl('','a.bar: func (x:u32, y:u32) -> u32', CoreFuncType(['i32','i32'],['i32']))],
-    [CoreExportDecl('_memory', CoreMemoryType(0, None)),
-     CoreExportDecl('_realloc', CoreFuncType(['i32','i32','i32','i32'],['i32'])),
-     CoreExportDecl('_start{cabi=0.1}: func (v1:string) -> (v2:list<list<string>>)',
+    [CoreExportDecl('cabi_memory', CoreMemoryType(0, None)),
+     CoreExportDecl('cabi_realloc', CoreFuncType(['i32','i32','i32','i32'],['i32'])),
+     CoreExportDecl('cabi_start{cabi=0.1}: func (v1:string) -> (v2:list<list<string>>)',
                     CoreFuncType(['i32','i32'],['i32'])),
      CoreExportDecl('baz: func () -> string', CoreFuncType([],['i32'])),
-     CoreExportDecl('_post-baz', CoreFuncType(['i32'],[]))]
+     CoreExportDecl('cabi_post_baz', CoreFuncType(['i32'],[]))]
   )
 )