aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ada/ChangeLog8
-rw-r--r--gcc/ada/gnatmem.adb15
2 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 43d42eb..b581007 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-25 Pascal Obry <obry@gnat.com>
+
+ * gnatmem.adb (Read_Next): fix Curs2 value to properly handle quiet
+ mode case for ALLOC case.
+
+ * gnatmem.adb (Read_Next): correctly fix parsing in Quiet mode on
+ all platforms. Improvement of last change.
+
2001-10-25 Robert Dewar <dewar@gnat.com>
* exp_ch4.adb (Expand_N_Allocator): Minor reformatting.
diff --git a/gcc/ada/gnatmem.adb b/gcc/ada/gnatmem.adb
index b345711..f8493d3 100644
--- a/gcc/ada/gnatmem.adb
+++ b/gcc/ada/gnatmem.adb
@@ -6,7 +6,7 @@
-- --
-- B o d y --
-- --
--- $Revision: 1.24 $
+-- $Revision$
-- --
-- Copyright (C) 1997-2001, Ada Core Technologies, Inc. --
-- --
@@ -191,7 +191,6 @@ procedure Gnatmem is
Target_Protocol_Len : Integer;
Cross_Case : Boolean := False;
-
Tmp_Size : Storage_Count := 0;
Tmp_Address : Integer_Address;
Tmp_Alloc : Allocation;
@@ -291,7 +290,6 @@ procedure Gnatmem is
end if;
end;
-
if Cross_Case then
Put (FD, "target ");
Put (FD, Target_Protocol (1 .. Target_Protocol_Len));
@@ -693,14 +691,14 @@ procedure Gnatmem is
return Eof;
elsif Line (1 .. 5) = "ALLOC" then
+ -- ALLOC ^ <size> ^0x <addr> ^
-- Read the size
- if Quiet_Mode then
- Curs2 := 5;
- else
- Curs1 := 7;
- Curs2 := Next_Separator - 1;
+ Curs1 := 7;
+ Curs2 := Next_Separator - 1;
+
+ if not Quiet_Mode then
Tmp_Size := Storage_Count'Value (Line (Curs1 .. Curs2));
end if;
@@ -713,6 +711,7 @@ procedure Gnatmem is
return Alloc;
elsif Line (1 .. 5) = "DEALL" then
+ -- DEALL ^ 0x <addr> ^
-- Read the address, skip "^0x"