[1/1] Fix broken GDB build after adding Bound table support for i386.

Message ID AC542571535E904D8E8ADAE745D60B194441FFDB@IRSMSX102.ger.corp.intel.com
State New, archived

Commit Message

Walfred Tedeschi June 10, 2015, 12:45 p.m. UTC
  Eli and Joel,

This should (I tested in one 32bit system Ubuntu 12.04) and could run make and make install.
Testes are still passing as before.

Thanks and regards,

-----Original Message-----
From: Tedeschi, Walfred 
Sent: Wednesday, June 10, 2015 2:43 PM
To: brobecker@adacore.com; eliz@gnu.org
Cc: gdb-patches@sourceware.org; Tedeschi, Walfred
Subject: [PATCH 1/1] Fix broken GDB build after adding Bound table support for i386.

Types used for some variables could not be used for 32 bits.
This patch changes uses larger types to accommodate the biggest integer possible.
Documentation was also affected, once a different version of texinfo the docs could not be build.

2015-06-10  Walfred Tedeschi  <walfred.tedeschi@intel.com>

	* i386-tdep.c (i386_mpx_get_bt_entry): Exchange CORE_ADDR by

	gdb.textinfo (i386): Fix "@end table" end and "@table" placement.
 gdb/doc/gdb.texinfo |  2 ++
 gdb/i386-tdep.c     | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

Sitz der Gesellschaft: Feldkirchen bei Muenchen
Geschaeftsfuehrer: Christian Lamprechter, Hannes Schwaderer, Douglas Lusk
Registergericht: Muenchen HRB 47456
Ust.-IdNr./VAT Registration No.: DE129385895
Citibank Frankfurt a.M. (BLZ 502 109 00) 600119052


diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 9e9138b..8b4cb88 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -22127,6 +22127,7 @@  be returned in a register.
 @kindex show struct-convention
 Show the current setting of the convention to return @code{struct}s  from functions.
+@end table
 @subsubsection Intel(R) @dfn{Memory Protection Extensions} (MPX).
@@ -22168,6 +22169,7 @@  the bounds pointer's value along with its bounds.  Evaluating and changing  bounds located in bound tables is therefore interesting while investigating  bugs on MPX context.  @value{GDBN} provides commands for this purpose:
+@table @code
 @item show mpx bound @var{pointer}
 @kindex show mpx bound
 Display bounds of the given @var{pointer}.
diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 6304591..7de9792 100644
--- a/gdb/i386-tdep.c
+++ b/gdb/i386-tdep.c
@@ -8665,13 +8665,13 @@  i386_mpx_enabled (void)  static CORE_ADDR  i386_mpx_get_bt_entry (CORE_ADDR ptr, CORE_ADDR bd_base)  {
-  CORE_ADDR offset1;
-  CORE_ADDR offset2;
-  CORE_ADDR mpx_bd_mask, bd_ptr_r_shift, bd_ptr_l_shift;
-  CORE_ADDR bt_mask, bt_select_r_shift, bt_select_l_shift;
-  CORE_ADDR bd_entry_addr;
-  CORE_ADDR bt_addr;
-  CORE_ADDR bd_entry;
+  ULONGEST offset1;
+  ULONGEST offset2;
+  ULONGEST mpx_bd_mask, bd_ptr_r_shift, bd_ptr_l_shift;  ULONGEST 
+ bt_mask, bt_select_r_shift, bt_select_l_shift;  ULONGEST 
+ bd_entry_addr;  ULONGEST bt_addr;  ULONGEST bd_entry;
   struct gdbarch *gdbarch = get_current_arch ();
   struct type *data_ptr_type = builtin_type (gdbarch)->builtin_data_ptr;

Intel GmbH
Dornacher Strasse 1
85622 Feldkirchen/Muenchen, Deutschland