Block申请内存的入口统一至runtime.Block.HeapAlloc，并同时返回 b, d

Author: 3dgen

internal/backends/compiler_wat/js_binding_tmpl.js

@@ -23,19 +23,17 @@ class WaApp {
       set_string: (s) => {
         const bytes = new TextEncoder("utf-8").encode(s);
         const l = bytes.length;
-        const b = this._wasm_inst.exports["runtime.Block.HeapAlloc"](l, 0, 1);
-        const d = b + 16;
-        this._mem_util.mem_array_u8(d, l).set(bytes);
-        return [b, d, l];
+        const bd = this._wasm_inst.exports["runtime.Block.HeapAlloc"](l, 0, 1);
+        this._mem_util.mem_array_u8(bd[1], l).set(bytes);
+        return [bd[0], bd[1], l];
       },
       get_bytes: (d, l) => { return this._mem_util.mem_array_u8(d, l).slice(0); },
       set_bytes: (bytes) => {
         const l = bytes.length;
         const c = l;
-        const b = this._wasm_inst.exports["runtime.Block.HeapAlloc"](l, 0, 1);
-        const d = b + 16;
-        this._mem_util.mem_array_u8(d, l).set(bytes);
-        return [b, d, l, c];
+        const bd = this._wasm_inst.exports["runtime.Block.HeapAlloc"](l, 0, 1);
+        this._mem_util.mem_array_u8(bd[1], l).set(bytes);
+        return [bd[0], bd[1], l, c];
       },
       block_release: (addr) => { this._wasm_inst.exports["runtime.Block.Release"](addr); },
       //基本类型直接读写：

internal/backends/compiler_wat/wir/value_block.go

@@ -81,33 +81,24 @@ func (t *Block) EmitLoadFromAddrNoRetain(addr Value, offset int) (insts []wat.In
 func (t *Block) emitHeapAlloc(item_count Value) (insts []wat.Inst) {
 	switch item_count.Kind() {
 	case ValueKindConst:
-		c, err := strconv.Atoi(item_count.Name())
+		_, err := strconv.Atoi(item_count.Name())
 		if err != nil {
 			logger.Fatalf("%v\n", err)
 			return nil
 		}
-		insts = append(insts, NewConst(strconv.Itoa(t.Base.Size()*c+16), t._uint).EmitPush()...)
-		insts = append(insts, wat.NewInstCall("runtime.HeapAlloc"))
 
 	default:
 		if !item_count.Type().Equal(t._uint) && !item_count.Type().Equal(t._int) {
 			logger.Fatal("item_count should be uint|int")
 			return nil
 		}
 
-		insts = append(insts, item_count.EmitPush()...)
-		insts = append(insts, NewConst(strconv.Itoa(t.Base.Size()), t._uint).EmitPush()...)
-		insts = append(insts, wat.NewInstMul(wat.U32{}))
-		insts = append(insts, NewConst("16", t._uint).EmitPush()...)
-		insts = append(insts, wat.NewInstAdd(wat.U32{}))
-		insts = append(insts, wat.NewInstCall("runtime.HeapAlloc"))
-
 	}
 
 	insts = append(insts, item_count.EmitPush()...)                                       //item_count
 	insts = append(insts, NewConst(strconv.Itoa(t.Base.OnFree()), t._uint).EmitPush()...) //free_method
 	insts = append(insts, NewConst(strconv.Itoa(t.Base.Size()), t._uint).EmitPush()...)   //item_size
-	insts = append(insts, wat.NewInstCall("runtime.Block.Init"))
+	insts = append(insts, wat.NewInstCall("runtime.Block.HeapAlloc"))
 
 	return
 }

internal/backends/compiler_wat/wir/value_ref.go

@@ -68,9 +68,6 @@ func (t *Ref) emitHeapAlloc() (insts []wat.Inst) {
 	//insts = append(insts, wat.NewComment("Ref.emitHeapAlloc start"))
 
 	insts = append(insts, t._base_block.emitHeapAlloc(NewConst("1", t.underlying._u32))...)
-	insts = append(insts, wat.NewInstCall("runtime.DupI32"))
-	insts = append(insts, NewConst("16", t.underlying._u32).EmitPush()...)
-	insts = append(insts, wat.NewInstAdd(wat.U32{}))
 
 	//insts = append(insts, wat.NewComment("Ref.emitHeapAlloc end"))
 	//insts = append(insts, wat.NewBlank())

internal/backends/compiler_wat/wir/value_slice.go

@@ -151,14 +151,9 @@ func (t *Slice) emitGenFromRefOfArray(x *aRef, low, high, max Value) (insts []wa
 }
 
 func (t *Slice) emitGenMake(Len, Cap Value) (insts []wat.Inst) {
-	//block:
+	//block, data:
 	insts = append(insts, t._base_block.emitHeapAlloc(Cap)...)
 
-	//data
-	insts = append(insts, wat.NewInstCall("runtime.DupI32"))
-	insts = append(insts, NewConst("16", t._u32).EmitPush()...)
-	insts = append(insts, wat.NewInstAdd(wat.U32{}))
-
 	//len:
 	if !Len.Type().Equal(t._u32) && !Len.Type().Equal(t._i32) {
 		logger.Fatal("Len should be u32")
@@ -285,11 +280,8 @@ func (t *Slice) genAppendFunc(m *Module) string {
 		if_false = append(if_false, NewConst("2", t._u32).EmitPush()...)
 		if_false = append(if_false, wat.NewInstMul(wat.U32{}))
 		if_false = append(if_false, new_cap.EmitPop()...)
-		if_false = append(if_false, t._base_block.emitHeapAlloc(new_cap)...) //block
+		if_false = append(if_false, t._base_block.emitHeapAlloc(new_cap)...) //block, data
 
-		if_false = append(if_false, wat.NewInstCall("runtime.DupI32"))
-		if_false = append(if_false, NewConst("16", t._u32).EmitPush()...)
-		if_false = append(if_false, wat.NewInstAdd(wat.U32{})) //data
 		if_false = append(if_false, wat.NewInstCall("runtime.DupI32"))
 		if_false = append(if_false, dest.EmitPop()...)     //dest
 		if_false = append(if_false, new_len.EmitPush()...) //len

internal/backends/compiler_wat/wir/value_string.go

@@ -111,11 +111,8 @@ func (t *String) genFunc_append(m *Module) string {
 
 	{ //if_false
 		//gen new string
-		f.Insts = append(f.Insts, t._u8_block.emitHeapAlloc(new_len)...) //block
+		f.Insts = append(f.Insts, t._u8_block.emitHeapAlloc(new_len)...) // block, data
 
-		f.Insts = append(f.Insts, wat.NewInstCall("runtime.DupI32"))
-		f.Insts = append(f.Insts, NewConst("16", t._u32).EmitPush()...)
-		f.Insts = append(f.Insts, wat.NewInstAdd(wat.U32{})) //data
 		f.Insts = append(f.Insts, wat.NewInstCall("runtime.DupI32"))
 		f.Insts = append(f.Insts, dest.EmitPop()...)     //dest
 		f.Insts = append(f.Insts, new_len.EmitPush()...) //len

waroot/src/runtime/heap.wat.ws

@@ -117,7 +117,8 @@
 	end
 )
 
-(func $runtime.Block.HeapAlloc (export "runtime.Block.HeapAlloc") (param $item_count i32) (param $release_func i32) (param $item_size i32) (result i32) ;;result = ptr_block
+(func $runtime.Block.HeapAlloc (export "runtime.Block.HeapAlloc") (param $item_count i32) (param $release_func i32) (param $item_size i32) (result i32 i32) ;;result = ptr_block, ptr_data
+  (local $b i32)
   local.get $item_count
   local.get $item_size
   i32.mul
@@ -129,6 +130,11 @@
   local.get $release_func
   local.get $item_size
   call $runtime.Block.Init
+  
+  local.tee $b
+  local.get $b
+  i32.const 16
+  i32.add
 )
 
 (func $runtime.DupI32 (param $a i32) (result i32 i32) ;;r0 = r1 = p0