diff mbox

[commit] Fix build break on ARM

Message ID 201103041639.p24Gd2pv005644@d06av02.portsmouth.uk.ibm.com
State Accepted
Headers show

Commit Message

Ulrich Weigand March 4, 2011, 4:39 p.m. UTC 
http://sourceware.org/ml/gdb-patches/2011-02/msg00024.html


ChangeLog:

	* arm-tdep.c (arm_analyze_load_stack_chk_guard): Avoid build break
	due to accessing uninitialized variable.  Fix indentation.
diff mbox

Patch

Index: gdb/arm-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/arm-tdep.c,v
retrieving revision 1.321
diff -u -p -r1.321 arm-tdep.c
--- gdb/arm-tdep.c	14 Jan 2011 20:37:13 -0000	1.321
+++ gdb/arm-tdep.c	2 Feb 2011 16:21:35 -0000
@@ -1198,29 +1198,30 @@  arm_analyze_load_stack_chk_guard(CORE_AD
     }
   else
     {
-       unsigned int insn
-	 = read_memory_unsigned_integer (pc, 4, byte_order_for_code);
-
-       if ((insn & 0x0e5f0000) == 0x041f0000) /* ldr Rd, #immed */
-	 {
-	   address = bits (insn, 0, 11);
-	   *destreg = bits (insn, 12, 15);
-	   *offset = 4;
-	 }
-       else if ((insn & 0x0ff00000) == 0x03000000) /* movw Rd, #const */
-	 {
-	   low = EXTRACT_MOVW_MOVT_IMM_A (insn);
+      unsigned int insn
+	= read_memory_unsigned_integer (pc, 4, byte_order_for_code);
 
-	   insn
-	     = read_memory_unsigned_integer (pc + 4, 4, byte_order_for_code);
+      if ((insn & 0x0e5f0000) == 0x041f0000) /* ldr Rd, #immed */
+	{
+	  address = bits (insn, 0, 11);
+	  *destreg = bits (insn, 12, 15);
+	  *offset = 4;
+	}
+      else if ((insn & 0x0ff00000) == 0x03000000) /* movw Rd, #const */
+	{
+	  low = EXTRACT_MOVW_MOVT_IMM_A (insn);
 
-	   if ((insn & 0x0ff00000) == 0x03400000)       /* movt Rd, #const */
-	     high = EXTRACT_MOVW_MOVT_IMM_A (insn);
+	  insn
+	    = read_memory_unsigned_integer (pc + 4, 4, byte_order_for_code);
 
-	   address = (high << 16 | low);
-	   *destreg = bits (insn, 12, 15);
-	   *offset = 8;
-	 }
+	  if ((insn & 0x0ff00000) == 0x03400000) /* movt Rd, #const */
+	    {
+	      high = EXTRACT_MOVW_MOVT_IMM_A (insn);
+	      *destreg = bits (insn, 12, 15);
+	      *offset = 8;
+	      address = (high << 16 | low);
+	    }
+	}
     }
 
   return address;