Browse Source

* WebAssembly: a_throw instruction renamed a_legacy_throw

Nikolay Nikolov 2 days ago
parent
commit
97bf2a5beb

+ 4 - 4
compiler/wasm32/aasmcpu.pas

@@ -1137,7 +1137,7 @@ uses
               PopVals(label_types(FCtrlStack[n]));
               PushVals(label_types(FCtrlStack[n]));
             end;
-          a_throw:
+          a_legacy_throw:
             Unreachable;
           a_rethrow:
             Unreachable;
@@ -2588,7 +2588,7 @@ uses
                 end;
             end;
           a_legacy_catch,
-          a_throw:
+          a_legacy_throw:
             begin
               if ops<>1 then
                 internalerror(2021092709);
@@ -3581,12 +3581,12 @@ uses
                 end;
             end;
           a_legacy_catch,
-          a_throw:
+          a_legacy_throw:
             begin
               case opcode of
                 a_legacy_catch:
                   WriteByte($07);
-                a_throw:
+                a_legacy_throw:
                   WriteByte($08);
                 else
                   internalerror(2021092708);

+ 1 - 1
compiler/wasm32/cpubase.pas

@@ -100,7 +100,7 @@ uses
       a_i64_trunc_sat_f64_s,
       a_i64_trunc_sat_f64_u,
       // exceptions (legacy)
-      a_legacy_try,a_legacy_catch,a_legacy_catch_all,a_legacy_delegate,a_throw,a_rethrow,a_end_try,
+      a_legacy_try,a_legacy_catch,a_legacy_catch_all,a_legacy_delegate,a_legacy_throw,a_rethrow,a_end_try,
       // atomic memory accesses - load/store
       a_i32_atomic_load8_u, a_i32_atomic_load16_u, a_i32_atomic_load,
       a_i64_atomic_load8_u, a_i64_atomic_load16_u, a_i64_atomic_load32_u,

+ 1 - 1
compiler/wasm32/nwasmflw.pas

@@ -1051,7 +1051,7 @@ implementation
           thlcgwasm(hlcg).a_cmp_const_reg_stack(current_asmdata.CurrAsmList,exceptionreasontype,OC_EQ,reason,reasonreg);
           current_asmdata.CurrAsmList.concat(taicpu.op_none(a_if));
           thlcgwasm(hlcg).decstack(current_asmdata.CurrAsmList,1);
-          current_asmdata.CurrAsmList.Concat(taicpu.op_sym(a_throw,current_asmdata.WeakRefAsmSymbol(FPC_EXCEPTION_TAG_SYM,AT_WASM_EXCEPTION_TAG)));
+          current_asmdata.CurrAsmList.Concat(taicpu.op_sym(a_legacy_throw,current_asmdata.WeakRefAsmSymbol(FPC_EXCEPTION_TAG_SYM,AT_WASM_EXCEPTION_TAG)));
           current_asmdata.CurrAsmList.concat(taicpu.op_none(a_end_if));
         end;
 

+ 1 - 1
compiler/wasm32/nwasminl.pas

@@ -440,7 +440,7 @@ implementation
     procedure twasminlinenode.second_throw_fpcexception;
       begin
         location_reset(location,LOC_VOID,OS_NO);
-        current_asmdata.CurrAsmList.Concat(taicpu.op_sym(a_throw,current_asmdata.WeakRefAsmSymbol(FPC_EXCEPTION_TAG_SYM,AT_WASM_EXCEPTION_TAG)));
+        current_asmdata.CurrAsmList.Concat(taicpu.op_sym(a_legacy_throw,current_asmdata.WeakRefAsmSymbol(FPC_EXCEPTION_TAG_SYM,AT_WASM_EXCEPTION_TAG)));
       end;