فهرست منبع

* ts_wasm_native_exceptions renamed ts_wasm_native_legacy_exceptions

Nikolay Nikolov 1 روز پیش
والد
کامیت
d7da4c90a0
6فایلهای تغییر یافته به همراه11 افزوده شده و 11 حذف شده
  1. 2 2
      compiler/fppu.pas
  2. 1 1
      compiler/globtype.pas
  3. 2 2
      compiler/options.pas
  4. 1 1
      compiler/wasm32/cpupi.pas
  5. 4 4
      compiler/wasm32/nwasmflw.pas
  6. 1 1
      compiler/wasm32/nwasmutil.pas

+ 2 - 2
compiler/fppu.pas

@@ -397,7 +397,7 @@ var
              ((mf_wasm_js_exceptions in moduleflags) <>
               (ts_wasm_js_exceptions in current_settings.targetswitches)) or
              ((mf_wasm_native_exceptions in moduleflags) <>
-              (ts_wasm_native_exceptions in current_settings.targetswitches)) then
+              (ts_wasm_native_legacy_exceptions in current_settings.targetswitches)) then
             begin
               Message(unit_u_ppu_invalid_wasm_exceptions_mode,@queuecomment);
               exit;
@@ -1121,7 +1121,7 @@ var
 {$ifdef wasm}
         if ts_wasm_no_exceptions in current_settings.targetswitches then
           include(moduleflags,mf_wasm_no_exceptions);
-        if ts_wasm_native_exceptions in current_settings.targetswitches then
+        if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
           include(moduleflags,mf_wasm_native_exceptions);
         if ts_wasm_js_exceptions in current_settings.targetswitches then
           include(moduleflags,mf_wasm_js_exceptions);

+ 1 - 1
compiler/globtype.pas

@@ -331,7 +331,7 @@ interface
          ts_wasm_js_exceptions,
          { native WebAssembly exceptions support:
            https://github.com/WebAssembly/exception-handling/blob/master/proposals/exception-handling/Exceptions.md }
-         ts_wasm_native_exceptions,
+         ts_wasm_native_legacy_exceptions,
          { support multithreading via the WebAssembly threading proposal:
            https://github.com/WebAssembly/threads/blob/master/proposals/threads/Overview.md }
          ts_wasm_threads,

+ 2 - 2
compiler/options.pas

@@ -2240,7 +2240,7 @@ begin
 {$ifdef wasm}
   if (Ord(ts_wasm_no_exceptions in init_settings.targetswitches)+
       Ord(ts_wasm_js_exceptions in init_settings.targetswitches)+
-      Ord(ts_wasm_native_exceptions in init_settings.targetswitches)+
+      Ord(ts_wasm_native_legacy_exceptions in init_settings.targetswitches)+
       Ord(ts_wasm_bf_exceptions in init_settings.targetswitches))>1 then
     begin
       Message(option_too_many_exception_modes);
@@ -5664,7 +5664,7 @@ begin
 {$endif m68k}
 {$ifdef wasm}
   { if no explicit exception handling mode is set for WebAssembly, assume no exceptions }
-  if init_settings.targetswitches*[ts_wasm_no_exceptions,ts_wasm_js_exceptions,ts_wasm_native_exceptions,ts_wasm_bf_exceptions]=[] then
+  if init_settings.targetswitches*[ts_wasm_no_exceptions,ts_wasm_js_exceptions,ts_wasm_native_legacy_exceptions,ts_wasm_bf_exceptions]=[] then
     begin
       def_system_macro(TargetSwitchStr[ts_wasm_no_exceptions].define);
       include(init_settings.targetswitches,ts_wasm_no_exceptions);

+ 1 - 1
compiler/wasm32/cpupi.pas

@@ -461,7 +461,7 @@ implementation
 
     procedure tcpuprocinfo.setup_eh;
       begin
-        if ts_wasm_native_exceptions in current_settings.targetswitches then
+        if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
           cexceptionstatehandler:=twasmexceptionstatehandler_nativeexceptions
         else if ts_wasm_js_exceptions in current_settings.targetswitches then
           cexceptionstatehandler:=twasmexceptionstatehandler_jsexceptions

+ 4 - 4
compiler/wasm32/nwasmflw.pas

@@ -409,7 +409,7 @@ implementation
       begin
         if ts_wasm_no_exceptions in current_settings.targetswitches then
           result:=pass_1_no_exceptions
-        else if ts_wasm_native_exceptions in current_settings.targetswitches then
+        else if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
           result:=pass_1_native_exceptions
         else if ts_wasm_bf_exceptions in current_settings.targetswitches then
           result:=pass_1_bf_exceptions
@@ -818,7 +818,7 @@ implementation
           pass_generate_code_no_exceptions
         else if ts_wasm_js_exceptions in current_settings.targetswitches then
           pass_generate_code_js_exceptions
-        else if ts_wasm_native_exceptions in current_settings.targetswitches then
+        else if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
           pass_generate_code_native_exceptions
         else if ts_wasm_bf_exceptions in current_settings.targetswitches then
           pass_generate_code_bf_exceptions
@@ -1417,7 +1417,7 @@ implementation
           pass_generate_code_no_exceptions
         else if ts_wasm_js_exceptions in current_settings.targetswitches then
           pass_generate_code_js_exceptions
-        else if ts_wasm_native_exceptions in current_settings.targetswitches then
+        else if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
           pass_generate_code_native_exceptions
         else if ts_wasm_bf_exceptions in current_settings.targetswitches then
           pass_generate_code_bf_exceptions
@@ -1745,7 +1745,7 @@ implementation
           pass_generate_code_no_exceptions
         else if ts_wasm_js_exceptions in current_settings.targetswitches then
           pass_generate_code_js_exceptions
-        else if ts_wasm_native_exceptions in current_settings.targetswitches then
+        else if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
           pass_generate_code_native_exceptions
         else if ts_wasm_bf_exceptions in current_settings.targetswitches then
           pass_generate_code_bf_exceptions

+ 1 - 1
compiler/wasm32/nwasmutil.pas

@@ -152,7 +152,7 @@ implementation
           list.Concat(tai_globaltype.create(TLS_BASE_SYM,wbt_i32,false));
         end;
 
-      if ts_wasm_native_exceptions in current_settings.targetswitches then
+      if ts_wasm_native_legacy_exceptions in current_settings.targetswitches then
         begin
           list.Concat(tai_tagtype.create(FPC_EXCEPTION_TAG_SYM, []));
           list.Concat(tai_symbol.Create_Weak(current_asmdata.WeakRefAsmSymbol(FPC_EXCEPTION_TAG_SYM,AT_WASM_EXCEPTION_TAG),0));