X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=sim%2Farm%2Farminit.c;h=bc5456f47b77ba91210438939ddf42cf509ea8f1;hb=45ac9b33042b80007ccff697ebcb088f1578b17a;hp=544a0c183fa616e288577965ed52d338b8a32a8f;hpb=8207e0f24ed02f921d7eb24fd80ac919e38a36f7;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c
index 544a0c183f..bc5456f47b 100644
--- a/sim/arm/arminit.c
+++ b/sim/arm/arminit.c
@@ -1,19 +1,23 @@
 /*  arminit.c -- ARMulator initialization:  ARM6 Instruction Emulator.
     Copyright (C) 1994 Advanced RISC Machines Ltd.
- 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
- 
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
- 
+
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+    along with this program; if not, see <http://www.gnu.org/licenses/>. */
+
+/* This must come before any other includes.  */
+#include "defs.h"
+
+#include <string.h>
 
 #include "armdefs.h"
 #include "armemu.h"
@@ -39,6 +43,10 @@ unsigned ARMul_MultTable[32] =
 ARMword ARMul_ImmedTable[4096];	/* immediate DP LHS values */
 char ARMul_BitList[256];	/* number of bits in a byte table */
 
+/* The PC pipeline value depends on whether ARM
+   or Thumb instructions are being executed.  */
+ARMword isize;
+
 /***************************************************************************\
 *         Call this routine once to set up the emulator's tables.           *
 \***************************************************************************/
@@ -197,7 +205,6 @@ ARMul_Reset (ARMul_State * state)
   FLUSHPIPE;
 
   state->EndCondition = 0;
-  state->ErrorCode = 0;
 
   state->Exception = FALSE;
   state->NresetSig = HIGH;
@@ -279,9 +286,6 @@ ARMul_Abort (ARMul_State * state, ARMword vector)
 
   state->Aborted = FALSE;
 
-  if (ARMul_OSException (state, vector, ARMul_GetPC (state)))
-    return;
-
   if (state->prog32Sig)
     if (ARMul_MODE26BIT)
       temp = R15PC;