Browse Source

* the FPC_WASM_NATIVE_EXCEPTIONS define renamed FPC_WASM_LEGACY_EXCEPTIONS

Nikolay Nikolov 1 week ago
parent
commit
e0064ab03f

+ 1 - 1
compiler/globtype.pas

@@ -477,7 +477,7 @@ interface
          (name: 'NOEXCEPTIONS';        hasvalue: false; isglobal: true ; define: 'FPC_WASM_NO_EXCEPTIONS'),
          (name: 'BFEXCEPTIONS';        hasvalue: false; isglobal: true ; define: 'FPC_WASM_BRANCHFUL_EXCEPTIONS'),
          (name: 'EXNREFEXCEPTIONS';    hasvalue: false; isglobal: true ; define: 'FPC_WASM_EXNREF_EXCEPTIONS'),
-         (name: 'WASMEXCEPTIONS';      hasvalue: false; isglobal: true ; define: 'FPC_WASM_NATIVE_EXCEPTIONS'),
+         (name: 'WASMEXCEPTIONS';      hasvalue: false; isglobal: true ; define: 'FPC_WASM_LEGACY_EXCEPTIONS'),
          (name: 'WASMTHREADS';         hasvalue: false; isglobal: true ; define: 'FPC_WASM_THREADS'),
          (name: 'SATURATINGFLOATTOINT';hasvalue: false; isglobal: false; define: 'FPC_WASM_SATURATING_FLOAT_TO_INT')
        );

+ 2 - 2
rtl/inc/compproc.inc

@@ -724,7 +724,7 @@ procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: pointer;DispDesc:
 
 
 {$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
-{$if not defined(FPC_WASM_NATIVE_EXCEPTIONS) and not defined(FPC_WASM_BRANCHFUL_EXCEPTIONS)}
+{$if not defined(FPC_WASM_LEGACY_EXCEPTIONS) and not defined(FPC_WASM_BRANCHFUL_EXCEPTIONS)}
 Function fpc_PushExceptAddr (Ft: {$ifdef CPU16}SmallInt{$else}Longint{$endif};_buf,_newaddr : pointer): PJmp_buf ; compilerproc;
 Procedure fpc_PopAddrStack; compilerproc;
 {$endif}
@@ -736,7 +736,7 @@ procedure fpc_Raiseexception (Obj : TObject; AnAddr : CodePointer; AFrame : Poin
 function fpc_PopObjectStack : TObject; compilerproc;
 function fpc_PopSecondObjectStack : TObject; compilerproc;
 Procedure fpc_ReRaise; compilerproc;
-{$if defined(FPC_WASM_NATIVE_EXCEPTIONS) or defined(FPC_WASM_BRANCHFUL_EXCEPTIONS)}
+{$if defined(FPC_WASM_LEGACY_EXCEPTIONS) or defined(FPC_WASM_BRANCHFUL_EXCEPTIONS)}
 Procedure fpc_ReRaise2; compilerproc;
 {$endif}
 Function fpc_Catches(Objtype : TClass) : TObject; compilerproc;

+ 1 - 1
rtl/inc/objpas.inc

@@ -1400,7 +1400,7 @@ end;
 {$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
   {$if defined(FPC_WASM_EXNREF_EXCEPTIONS)}
     {$I except_exnref.inc}
-  {$elseif defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+  {$elseif defined(FPC_WASM_LEGACY_EXCEPTIONS)}
     {$I except_legacy.inc}
   {$elseif defined(FPC_WASM_BRANCHFUL_EXCEPTIONS)}
     {$I except_branchful.inc}

+ 2 - 2
rtl/wasicommon/si_dll.pp

@@ -17,7 +17,7 @@
 
 unit si_dll;
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
   {$MODESWITCH EXCEPTIONS}
 {$endif}
 
@@ -29,7 +29,7 @@ implementation
 
 procedure PASCALMAIN; external 'PASCALMAIN';
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
 Procedure DoUnHandledException; external name 'FPC_DOUNHANDLEDEXCEPTION';
 
 procedure _initialize_pascal;

+ 2 - 2
rtl/wasicommon/si_prc.pp

@@ -17,7 +17,7 @@
 
 unit si_prc;
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
   {$MODESWITCH EXCEPTIONS}
 {$endif}
 
@@ -29,7 +29,7 @@ implementation
 
 procedure PASCALMAIN; external 'PASCALMAIN';
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
 Procedure DoUnHandledException; external name 'FPC_DOUNHANDLEDEXCEPTION';
 
 procedure _start_pascal;

+ 2 - 2
rtl/wasip2/si_dll.pp

@@ -17,7 +17,7 @@
 
 unit si_dll;
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
   {$MODESWITCH EXCEPTIONS}
 {$endif}
 
@@ -29,7 +29,7 @@ implementation
 
 procedure PASCALMAIN; external 'PASCALMAIN';
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
 Procedure DoUnHandledException; external name 'FPC_DOUNHANDLEDEXCEPTION';
 
 procedure _initialize_pascal;

+ 2 - 2
rtl/wasip2/si_prc.pp

@@ -17,7 +17,7 @@
 
 unit si_prc;
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
   {$MODESWITCH EXCEPTIONS}
 {$endif}
 
@@ -29,7 +29,7 @@ implementation
 
 procedure PASCALMAIN; external 'PASCALMAIN';
 
-{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_NATIVE_EXCEPTIONS)}
+{$if defined(FPC_WASM_BRANCHFUL_EXCEPTIONS) or defined(FPC_WASM_LEGACY_EXCEPTIONS)}
 Procedure DoUnHandledException; external name 'FPC_DOUNHANDLEDEXCEPTION';
 
 procedure _start_pascal;