소스 검색

* fpc_raiseexception does not return a result.

git-svn-id: trunk@26837 -
sergei 11 년 전
부모
커밋
d004607876
5개의 변경된 파일5개의 추가작업 그리고 8개의 파일을 삭제
  1. 1 1
      rtl/inc/compproc.inc
  2. 1 2
      rtl/inc/except.inc
  3. 1 1
      rtl/java/jcompproc.inc
  4. 1 2
      rtl/win32/seh32.inc
  5. 1 2
      rtl/win64/seh64.inc

+ 1 - 1
rtl/inc/compproc.inc

@@ -598,7 +598,7 @@ procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: pointer;DispDesc:
 
 {$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
 Function fpc_PushExceptAddr (Ft: {$ifdef CPU16}SmallInt{$else}Longint{$endif};_buf,_newaddr : pointer): PJmp_buf ; compilerproc;
-Function fpc_Raiseexception (Obj : TObject; AnAddr : CodePointer; AFrame : Pointer) : TObject; compilerproc;
+procedure fpc_Raiseexception (Obj : TObject; AnAddr : CodePointer; AFrame : Pointer); compilerproc;
 Procedure fpc_PopAddrStack; compilerproc;
 function fpc_PopObjectStack : TObject; compilerproc;
 function fpc_PopSecondObjectStack : TObject; compilerproc;

+ 1 - 2
rtl/inc/except.inc

@@ -211,7 +211,7 @@ begin
 end;
 
 {$ifndef FPC_SYSTEM_HAS_RAISEEXCEPTION}
-Function fpc_RaiseException (Obj : TObject; AnAddr : CodePointer; AFrame : Pointer) : TObject;[Public, Alias : 'FPC_RAISEEXCEPTION']; compilerproc;
+procedure fpc_RaiseException (Obj : TObject; AnAddr : CodePointer; AFrame : Pointer);[Public, Alias : 'FPC_RAISEEXCEPTION']; compilerproc;
 var
   _ExceptObjectStack : PExceptObject;
   _ExceptAddrstack : PExceptAddr;
@@ -219,7 +219,6 @@ begin
 {$ifdef excdebug}
   writeln ('In RaiseException');
 {$endif}
-  fpc_Raiseexception:=nil;
   PushExceptObject(Obj,AnAddr,AFrame);
   _ExceptAddrstack:=ExceptAddrStack;
   If _ExceptAddrStack=Nil then

+ 1 - 1
rtl/java/jcompproc.inc

@@ -494,7 +494,7 @@ procedure fpc_dispatch_by_id(Result: Pointer; const Dispatch: pointer;DispDesc:
 (*
 {$ifdef FPC_HAS_FEATURE_EXCEPTIONS}
 Function fpc_PushExceptAddr (Ft: Longint;_buf,_newaddr : pointer): PJmp_buf ; compilerproc;
-Function fpc_Raiseexception (Obj : TObject; AnAddr,AFrame : Pointer) : TObject; compilerproc;
+procedure fpc_Raiseexception (Obj : TObject; AnAddr,AFrame : Pointer); compilerproc;
 Procedure fpc_PopAddrStack; compilerproc;
 function fpc_PopObjectStack : TObject; compilerproc;
 function fpc_PopSecondObjectStack : TObject; compilerproc;

+ 1 - 2
rtl/win32/seh32.inc

@@ -55,7 +55,7 @@ begin
 end;
 
 
-function fpc_RaiseException(Obj: TObject; AnAddr,AFrame: Pointer): TObject; [public,alias: 'FPC_RAISEEXCEPTION']; compilerproc;
+procedure fpc_RaiseException(Obj: TObject; AnAddr,AFrame: Pointer); [public,alias: 'FPC_RAISEEXCEPTION']; compilerproc;
 var
   ctx: TContext;
   args: array[0..3] of PtrUint;
@@ -65,7 +65,6 @@ begin
   args[1]:=PtrUint(Obj);
   args[2]:=GetBacktrace(ctx,AFrame,PPointer(args[3]));
   RaiseException(FPC_EXCEPTION_CODE,EXCEPTION_NONCONTINUABLE,4,@args[0]);
-  result:=nil;
 end;
 
 

+ 1 - 2
rtl/win64/seh64.inc

@@ -266,7 +266,7 @@ end;
 
 {$push}
 {$codealign localmin=16}          { TContext record requires this }
-function fpc_RaiseException(Obj: TObject; AnAddr,AFrame: Pointer): TObject; [public,alias: 'FPC_RAISEEXCEPTION']; compilerproc;
+procedure fpc_RaiseException(Obj: TObject; AnAddr,AFrame: Pointer); [public,alias: 'FPC_RAISEEXCEPTION']; compilerproc;
 var
   ctx: TContext;
   args: array[0..3] of PtrUint;
@@ -276,7 +276,6 @@ begin
   args[1]:=PtrUint(Obj);
   args[2]:=GetBacktrace(ctx,AFrame,PPointer(args[3]));
   RaiseException(FPC_EXCEPTION_CODE,EXCEPTION_NONCONTINUABLE,4,@args[0]);
-  result:=nil;
 end;
 
 procedure _fpc_local_unwind(frame,target: Pointer);[public,alias:'_FPC_local_unwind'];compilerproc;