From 78d5e706acc2689acb07a135529a2af38aa0652e Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Mon, 15 Nov 1999 21:49:47 +0000
Subject: [PATCH]   * exception address fixes

---
 rtl/inc/system.inc     | 9 ++++++---
 rtl/objpas/sysutils.pp | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/rtl/inc/system.inc b/rtl/inc/system.inc
index 871509859b..9c849badab 100644
--- a/rtl/inc/system.inc
+++ b/rtl/inc/system.inc
@@ -569,7 +569,7 @@ procedure AbstractError;[public,alias : 'FPC_ABSTRACTERROR'];
 begin
   If AbstractErrorProc<>nil then
     AbstractErrorProc();
-  HandleError(211);
+  HandleErrorFrame(211,get_frame);
 end;
 
 
@@ -578,7 +578,7 @@ begin
   if AssertErrorProc<>nil then
     AssertErrorProc(Msg,FName,LineNo,ErrorAddr)
   else
-    HandleError(227);
+    HandleErrorFrame(227,get_frame);
 end;
 
 
@@ -608,7 +608,10 @@ end;
 
 {
   $Log$
-  Revision 1.71  1999-11-09 22:40:12  pierre
+  Revision 1.72  1999-11-15 21:49:47  peter
+    * exception address fixes
+
+  Revision 1.71  1999/11/09 22:40:12  pierre
    + get also first BackTrace address with '  0x' prefix
 
   Revision 1.70  1999/11/09 20:14:12  daniel
diff --git a/rtl/objpas/sysutils.pp b/rtl/objpas/sysutils.pp
index 7d906214c5..878951e097 100644
--- a/rtl/objpas/sysutils.pp
+++ b/rtl/objpas/sysutils.pp
@@ -189,7 +189,7 @@ Procedure CatchUnhandledException (Obj : TObject; Addr: Pointer);
 Var
   Message : String;
 begin
-  Writeln(stdout,'An unhandled exception occurred at ',HexStr(Longint(Addr),8),' :');
+  Writeln(stdout,'An unhandled exception occurred at 0x',HexStr(Longint(Addr),8),' :');
   if Obj is exception then
    begin
      Message:=Exception(Obj).Message;
@@ -250,7 +250,7 @@ begin
   else
    E:=Exception.CreateFmt (SUnKnownRunTimeError,[Errno]);
   end;
-  Raise E {at Address};
+  Raise E at longint(Address);
 end;
 
 
@@ -293,7 +293,10 @@ Finalization
 end.
 {
     $Log$
-    Revision 1.35  1999-11-06 14:41:31  peter
+    Revision 1.36  1999-11-15 21:49:47  peter
+      * exception address fixes
+
+    Revision 1.35  1999/11/06 14:41:31  peter
       * truncated log
 
     Revision 1.34  1999/10/30 17:39:05  peter