Browse Source

+ default exception handling in WebAssembly native exceptions mode

Nikolay Nikolov 3 years ago
parent
commit
387c80cc57
2 changed files with 3 additions and 3 deletions
  1. 2 2
      rtl/wasi/si_prc.pp
  2. 1 1
      rtl/wasm32/except_native.inc

+ 2 - 2
rtl/wasi/si_prc.pp

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

+ 1 - 1
rtl/wasm32/except_native.inc

@@ -123,7 +123,7 @@ begin
   Result:=NewObj;
   Result:=NewObj;
 end;
 end;
 
 
-Procedure DoUnHandledException;
+Procedure DoUnHandledException;[Public, Alias : 'FPC_DOUNHANDLEDEXCEPTION'];
 var
 var
   _ExceptObjectStack : PExceptObject;
   _ExceptObjectStack : PExceptObject;
 begin
 begin