浏览代码

Removed HAS_ADDR_STACK_ON_STACK define

git-svn-id: trunk@261 -
michael 20 年之前
父节点
当前提交
5d02b2c6cc
共有 1 个文件被更改,包括 1 次插入28 次删除
  1. 1 28
      rtl/inc/except.inc

+ 1 - 28
rtl/inc/except.inc

@@ -72,13 +72,8 @@ begin
 end;
 end;
 end;
 end;
 
 
-{$ifndef HAS_ADDR_STACK_ON_STACK}
-Function fpc_PushExceptAddr (Ft: Longint): PJmp_buf ;
-  [Public, Alias : 'FPC_PUSHEXCEPTADDR'];{$ifndef NOSAVEREGISTERS}saveregisters;{$endif}
-{$else HAS_ADDR_STACK_ON_STACK}
 Function fpc_PushExceptAddr (Ft: Longint;_buf,_newaddr : pointer): PJmp_buf ;
 Function fpc_PushExceptAddr (Ft: Longint;_buf,_newaddr : pointer): PJmp_buf ;
   [Public, Alias : 'FPC_PUSHEXCEPTADDR'];{$ifndef NOSAVEREGISTERS}saveregisters;{$endif}{$ifdef hascompilerproc} compilerproc; {$endif}
   [Public, Alias : 'FPC_PUSHEXCEPTADDR'];{$ifndef NOSAVEREGISTERS}saveregisters;{$endif}{$ifdef hascompilerproc} compilerproc; {$endif}
-{$endif HAS_ADDR_STACK_ON_STACK}
 
 
 var
 var
   Buf : PJmp_buf;
   Buf : PJmp_buf;
@@ -89,28 +84,16 @@ begin
 {$endif}
 {$endif}
   If ExceptAddrstack=Nil then
   If ExceptAddrstack=Nil then
     begin
     begin
-{$ifndef HAS_ADDR_STACK_ON_STACK}
-      New(ExceptAddrStack);
-{$else HAS_ADDR_STACK_ON_STACK}
       ExceptAddrStack:=PExceptAddr(_newaddr);
       ExceptAddrStack:=PExceptAddr(_newaddr);
-{$endif HAS_ADDR_STACK_ON_STACK}
       ExceptAddrStack^.Next:=Nil;
       ExceptAddrStack^.Next:=Nil;
     end
     end
   else
   else
     begin
     begin
-{$ifndef HAS_ADDR_STACK_ON_STACK}
-      New(NewAddr);
-{$else HAS_ADDR_STACK_ON_STACK}
       NewAddr:=PExceptAddr(_newaddr);
       NewAddr:=PExceptAddr(_newaddr);
-{$endif HAS_ADDR_STACK_ON_STACK}
       NewAddr^.Next:=ExceptAddrStack;
       NewAddr^.Next:=ExceptAddrStack;
       ExceptAddrStack:=NewAddr;
       ExceptAddrStack:=NewAddr;
     end;
     end;
-{$ifndef HAS_ADDR_STACK_ON_STACK}
-  new(buf);
-{$else HAS_ADDR_STACK_ON_STACK}
   buf:=PJmp_Buf(_buf);
   buf:=PJmp_Buf(_buf);
-{$endif HAS_ADDR_STACK_ON_STACK}
   ExceptAddrStack^.Buf:=Buf;
   ExceptAddrStack^.Buf:=Buf;
   ExceptAddrStack^.FrameType:=ft;
   ExceptAddrStack^.FrameType:=ft;
   fpc_PushExceptAddr:=Buf;
   fpc_PushExceptAddr:=Buf;
@@ -206,10 +189,7 @@ end;
 
 
 
 
 Procedure fpc_PopAddrStack;[Public, Alias : 'FPC_POPADDRSTACK']; {$ifdef hascompilerproc} compilerproc; {$endif}
 Procedure fpc_PopAddrStack;[Public, Alias : 'FPC_POPADDRSTACK']; {$ifdef hascompilerproc} compilerproc; {$endif}
-{$ifndef HAS_ADDR_STACK_ON_STACK}
-var
-  hp : PExceptAddr;
-{$endif HAS_ADDR_STACK_ON_STACK}
+
 begin
 begin
 {$ifdef excdebug}
 {$ifdef excdebug}
   writeln ('In Popaddrstack');
   writeln ('In Popaddrstack');
@@ -221,14 +201,7 @@ begin
     end
     end
   else
   else
     begin
     begin
-{$ifndef HAS_ADDR_STACK_ON_STACK}
-      hp:=ExceptAddrStack;
-      ExceptAddrStack:=ExceptAddrStack^.Next;
-      dispose(hp^.buf);
-      dispose(hp);
-{$else HAS_ADDR_STACK_ON_STACK}
       ExceptAddrStack:=ExceptAddrStack^.Next;
       ExceptAddrStack:=ExceptAddrStack^.Next;
-{$endif HAS_ADDR_STACK_ON_STACK}
     end;
     end;
 end;
 end;