X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2Farm%2Farminit.c;h=3a626c84674ea71814d009ef32e242598c3771a9;hb=87f83f20023bf366c14ec4e0fd307948d96caaee;hp=df01570fc0b9e3f1a589e4dd90e0428cb481b483;hpb=380d9419c99660cdfb1501be9a14630ad5e398cf;p=deliverable%2Fbinutils-gdb.git
diff --git a/sim/arm/arminit.c b/sim/arm/arminit.c
index df01570fc0..3a626c8467 100644
--- a/sim/arm/arminit.c
+++ b/sim/arm/arminit.c
@@ -1,19 +1,20 @@
/* 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see . */
+
+#include
#include "armdefs.h"
#include "armemu.h"
@@ -39,6 +40,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 +202,6 @@ ARMul_Reset (ARMul_State * state)
FLUSHPIPE;
state->EndCondition = 0;
- state->ErrorCode = 0;
state->Exception = FALSE;
state->NresetSig = HIGH;
@@ -279,9 +283,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;