Require GNU make
[binutils-gdb.git] / sim / arm / armos.c
index d833665ac2d56e7868c754fe4a893ed2bab6eb13..2ce7051a44ceeb92fa34233402b459ccf758e12c 100644 (file)
@@ -1,19 +1,18 @@
 /*  armos.c -- ARMulator OS interface:  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 file contains a model of Demon, ARM Ltd's Debug Monitor,
    including all the SWI's required to support the C library. The code in
 
 #include "config.h"
 #include "ansidecl.h"
+#include "libiberty.h"
 
 #include <time.h>
 #include <errno.h>
+#include <limits.h>
 #include <string.h>
-#include <fcntl.h>
-
-#ifndef O_RDONLY
-#define O_RDONLY 0
-#endif
-#ifndef O_WRONLY
-#define O_WRONLY 1
-#endif
-#ifndef O_RDWR
-#define O_RDWR   2
-#endif
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
+#include "targ-vals.h"
 
-#ifdef __STDC__
-#define unlink(s) remove(s)
+#ifndef TARGET_O_BINARY
+#define TARGET_O_BINARY 0
 #endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>            /* For SEEK_SET etc.  */
 #endif
 
-#ifdef __riscos
-extern int _fisatty (FILE *);
-#define isatty_(f) _fisatty(f)
-#else
-#ifdef __ZTC__
-#include <io.h>
-#define isatty_(f) isatty((f)->_file)
-#else
-#ifdef macintosh
-#include <ioctl.h>
-#define isatty_(f) (~ioctl ((f)->_file, FIOINTERACTIVE, NULL))
-#else
-#define isatty_(f) isatty (fileno (f))
-#endif
-#endif
-#endif
-
 #include "armdefs.h"
 #include "armos.h"
 #include "armemu.h"
@@ -83,52 +54,37 @@ extern int _fisatty (FILE *);
 /* For RDIError_BreakpointReached.  */
 #include "dbg_rdi.h"
 
-#include "callback.h"
+#include "gdb/callback.h"
 extern host_callback *sim_callback;
 
 extern unsigned ARMul_OSInit       (ARMul_State *);
-extern void     ARMul_OSExit       (ARMul_State *);
 extern unsigned ARMul_OSHandleSWI  (ARMul_State *, ARMword);
-extern unsigned ARMul_OSException  (ARMul_State *, ARMword, ARMword);
-extern ARMword  ARMul_OSLastErrorP (ARMul_State *);
-extern ARMword  ARMul_Debug        (ARMul_State *, ARMword, ARMword);
 
-#define BUFFERSIZE 4096
 #ifndef FOPEN_MAX
 #define FOPEN_MAX 64
 #endif
-#define UNIQUETEMPS 256
+#ifndef PATH_MAX
+#define PATH_MAX 1024
+#endif
 
 /* OS private Information.  */
 
 struct OSblock
 {
-  ARMword Time0;
-  ARMword ErrorP;
   ARMword ErrorNo;
-  FILE *FileTable[FOPEN_MAX];
-  char FileFlags[FOPEN_MAX];
-  char *tempnames[UNIQUETEMPS];
 };
 
-#define NOOP 0
-#define BINARY 1
-#define READOP 2
-#define WRITEOP 4
+/* Bit mask of enabled SWI implementations.  */
+unsigned int swi_mask = -1;
 
-#ifdef macintosh
-#define FIXCRLF(t,c) ((t & BINARY) ? \
-                      c : \
-                      ((c == '\n' || c == '\r' ) ? (c ^ 7) : c) \
-                     )
-#else
-#define FIXCRLF(t,c) c
-#endif
 
 static ARMword softvectorcode[] =
 {
-  /* Basic: swi tidyexception + event; mov pc, lr;
-     ldmia r11,{r11,pc}; swi generateexception  + event.  */
+  /* Installed instructions:
+       swi    tidyexception + event;
+       mov    lr, pc;
+       ldmia  fp, {fp, pc};
+       swi    generateexception  + event.  */
   0xef000090, 0xe1a0e00f, 0xe89b8800, 0xef000080, /* Reset */
   0xef000091, 0xe1a0e00f, 0xe89b8800, 0xef000081, /* Undef */
   0xef000092, 0xe1a0e00f, 0xe89b8800, 0xef000082, /* SWI */
@@ -160,20 +116,19 @@ ARMul_OSInit (ARMul_State * state)
          exit (15);
        }
     }
-  
+
   OSptr = (struct OSblock *) state->OSptr;
-  OSptr->ErrorP = 0;
   state->Reg[13] = ADDRSUPERSTACK;                     /* Set up a stack for the current mode...  */
   ARMul_SetReg (state, SVC32MODE,   13, ADDRSUPERSTACK);/* ...and for supervisor mode...  */
   ARMul_SetReg (state, ABORT32MODE, 13, ADDRSUPERSTACK);/* ...and for abort 32 mode...  */
   ARMul_SetReg (state, UNDEF32MODE, 13, ADDRSUPERSTACK);/* ...and for undef 32 mode...  */
   ARMul_SetReg (state, SYSTEMMODE,  13, ADDRSUPERSTACK);/* ...and for system mode.  */
   instr = 0xe59ff000 | (ADDRSOFTVECTORS - 8);          /* Load pc from soft vector */
-  
+
   for (i = ARMul_ResetV; i <= ARMFIQV; i += 4)
     /* Write hardware vectors.  */
     ARMul_WriteWord (state, i, instr);
-  
+
   SWI_vector_installed = 0;
 
   for (i = ARMul_ResetV; i <= ARMFIQV + 4; i += 4)
@@ -186,12 +141,6 @@ ARMul_OSInit (ARMul_State * state)
   for (i = 0; i < sizeof (softvectorcode); i += 4)
     ARMul_WriteWord (state, SOFTVECTORCODE + i, softvectorcode[i / 4]);
 
-  for (i = 0; i < FOPEN_MAX; i++)
-    OSptr->FileTable[i] = NULL;
-
-  for (i = 0; i < UNIQUETEMPS; i++)
-    OSptr->tempnames[i] = NULL;
-
   ARMul_ConsolePrint (state, ", Demon 1.01");
 
 /* #ifndef ASIM */
@@ -201,11 +150,15 @@ ARMul_OSInit (ARMul_State * state)
     /* Copy the code.  */
     ARMul_WriteWord (state, FPESTART + i, fpecode[i >> 2]);
 
+  /* Scan backwards from the end of the code.  */
   for (i = FPESTART + fpesize;; i -= 4)
     {
-      /* Reverse the error strings.  */
+      /* When we reach the marker value, break out of
+        the loop, leaving i pointing at the maker.  */
       if ((j = ARMul_ReadWord (state, i)) == 0xffffffff)
        break;
+
+      /* If necessary, reverse the error strings.  */
       if (state->bigendSig && j < 0x80000000)
        {
          /* It's part of the string so swap it.  */
@@ -217,46 +170,36 @@ ARMul_OSInit (ARMul_State * state)
     }
 
   /* Copy old illegal instr vector.  */
-  ARMul_WriteWord (state, FPEOLDVECT, ARMul_ReadWord (state, 4));
+  ARMul_WriteWord (state, FPEOLDVECT, ARMul_ReadWord (state, ARMUndefinedInstrV));
   /* Install new vector.  */
-  ARMul_WriteWord (state, 4, FPENEWVECT (ARMul_ReadWord (state, i - 4)));
+  ARMul_WriteWord (state, ARMUndefinedInstrV, FPENEWVECT (ARMul_ReadWord (state, i - 4)));
   ARMul_ConsolePrint (state, ", FPE");
 
 /* #endif  ASIM */
 #endif /* VALIDATE */
 #endif /* NOOS */
 
-  return TRUE;
-}
-
-void
-ARMul_OSExit (ARMul_State * state)
-{
-  free ((char *) state->OSptr);
-}
-
-
-/* Return the last Operating System Error.  */
+  /* Intel do not want DEMON SWI support.  */
+   if (state->is_XScale)
+    swi_mask = SWI_MASK_ANGEL;
 
-ARMword ARMul_OSLastErrorP (ARMul_State * state)
-{
-  return ((struct OSblock *) state->OSptr)->ErrorP;
+   return TRUE;
 }
 
 static int translate_open_mode[] =
 {
-  O_RDONLY,                    /* "r"   */
-  O_RDONLY + O_BINARY,         /* "rb"  */
-  O_RDWR,                      /* "r+"  */
-  O_RDWR + O_BINARY,           /* "r+b" */
-  O_WRONLY + O_CREAT + O_TRUNC,        /* "w"   */
-  O_WRONLY + O_BINARY + O_CREAT + O_TRUNC,     /* "wb"  */
-  O_RDWR + O_CREAT + O_TRUNC,  /* "w+"  */
-  O_RDWR + O_BINARY + O_CREAT + O_TRUNC,       /* "w+b" */
-  O_WRONLY + O_APPEND + O_CREAT,       /* "a"   */
-  O_WRONLY + O_BINARY + O_APPEND + O_CREAT,    /* "ab"  */
-  O_RDWR + O_APPEND + O_CREAT, /* "a+"  */
-  O_RDWR + O_BINARY + O_APPEND + O_CREAT       /* "a+b" */
+  TARGET_O_RDONLY,             /* "r"   */
+  TARGET_O_RDONLY + TARGET_O_BINARY,   /* "rb"  */
+  TARGET_O_RDWR,               /* "r+"  */
+  TARGET_O_RDWR + TARGET_O_BINARY,             /* "r+b" */
+  TARGET_O_WRONLY + TARGET_O_CREAT + TARGET_O_TRUNC,   /* "w"   */
+  TARGET_O_WRONLY + TARGET_O_BINARY + TARGET_O_CREAT + TARGET_O_TRUNC, /* "wb"  */
+  TARGET_O_RDWR + TARGET_O_CREAT + TARGET_O_TRUNC,     /* "w+"  */
+  TARGET_O_RDWR + TARGET_O_BINARY + TARGET_O_CREAT + TARGET_O_TRUNC,   /* "w+b" */
+  TARGET_O_WRONLY + TARGET_O_APPEND + TARGET_O_CREAT,  /* "a"   */
+  TARGET_O_WRONLY + TARGET_O_BINARY + TARGET_O_APPEND + TARGET_O_CREAT,        /* "ab"  */
+  TARGET_O_RDWR + TARGET_O_APPEND + TARGET_O_CREAT,    /* "a+"  */
+  TARGET_O_RDWR + TARGET_O_BINARY + TARGET_O_APPEND + TARGET_O_CREAT   /* "a+b" */
 };
 
 static void
@@ -266,7 +209,13 @@ SWIWrite0 (ARMul_State * state, ARMword addr)
   struct OSblock *OSptr = (struct OSblock *) state->OSptr;
 
   while ((temp = ARMul_SafeReadByte (state, addr++)) != 0)
-    (void) sim_callback->write_stdout (sim_callback, (char *) &temp, 1);
+    {
+      char buffer = temp;
+      /* Note - we cannot just cast 'temp' to a (char *) here,
+        since on a big-endian host the byte value will end
+        up in the wrong place and a nul character will be printed.  */
+      (void) sim_callback->write_stdout (sim_callback, & buffer, 1);
+    }
 
   OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
 }
@@ -287,31 +236,47 @@ WriteCommandLineTo (ARMul_State * state, ARMword addr)
   while (temp != 0);
 }
 
+static int
+ReadFileName (ARMul_State * state, char *buf, ARMword src, size_t n)
+{
+  struct OSblock *OSptr = (struct OSblock *) state->OSptr;
+  char *p = buf;
+
+  while (n--)
+    if ((*p++ = ARMul_SafeReadByte (state, src++)) == '\0')
+      return 0;
+  OSptr->ErrorNo = cb_host_to_target_errno (sim_callback, ENAMETOOLONG);
+  state->Reg[0] = -1;
+  return -1;
+}
+
 static void
 SWIopen (ARMul_State * state, ARMword name, ARMword SWIflags)
 {
   struct OSblock *OSptr = (struct OSblock *) state->OSptr;
-  char dummy[2000];
+  char buf[PATH_MAX];
   int flags;
-  int i;
 
-  for (i = 0; (dummy[i] = ARMul_SafeReadByte (state, name + i)); i++)
-    ;
+  if (ReadFileName (state, buf, name, sizeof buf) == -1)
+    return;
 
   /* Now we need to decode the Demon open mode.  */
-  flags = translate_open_mode[SWIflags];
+  if (SWIflags >= ARRAY_SIZE (translate_open_mode))
+    flags = 0;
+  else
+    flags = translate_open_mode[SWIflags];
 
   /* Filename ":tt" is special: it denotes stdin/out.  */
-  if (strcmp (dummy, ":tt") == 0)
+  if (strcmp (buf, ":tt") == 0)
     {
-      if (flags == O_RDONLY)   /* opening tty "r" */
+      if (flags == TARGET_O_RDONLY) /* opening tty "r" */
        state->Reg[0] = 0;      /* stdin */
       else
        state->Reg[0] = 1;      /* stdout */
     }
   else
     {
-      state->Reg[0] = sim_callback->open (sim_callback, dummy, flags);
+      state->Reg[0] = sim_callback->open (sim_callback, buf, flags);
       OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
     }
 }
@@ -328,8 +293,8 @@ SWIread (ARMul_State * state, ARMword f, ARMword ptr, ARMword len)
     {
       sim_callback->printf_filtered
        (sim_callback,
-        "sim: Unable to read 0x%ulx bytes - out of memory\n",
-        len);
+        "sim: Unable to read 0x%lx bytes - out of memory\n",
+        (long)len);
       return;
     }
 
@@ -376,7 +341,7 @@ SWIflen (ARMul_State * state, ARMword fh)
   struct OSblock *OSptr = (struct OSblock *) state->OSptr;
   ARMword addr;
 
-  if (fh == 0 || fh > FOPEN_MAX)
+  if (fh > FOPEN_MAX)
     {
       OSptr->ErrorNo = EBADF;
       state->Reg[0] = -1L;
@@ -391,116 +356,167 @@ SWIflen (ARMul_State * state, ARMword fh)
   OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
 }
 
+static void
+SWIremove (ARMul_State * state, ARMword path)
+{
+  char buf[PATH_MAX];
+
+  if (ReadFileName (state, buf, path, sizeof buf) != -1)
+    {
+      struct OSblock *OSptr = (struct OSblock *) state->OSptr;
+      state->Reg[0] = sim_callback->unlink (sim_callback, buf);
+      OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+    }
+}
+
+static void
+SWIrename (ARMul_State * state, ARMword old, ARMword new)
+{
+  char oldbuf[PATH_MAX], newbuf[PATH_MAX];
+
+  if (ReadFileName (state, oldbuf, old, sizeof oldbuf) != -1
+      && ReadFileName (state, newbuf, new, sizeof newbuf) != -1)
+    {
+      struct OSblock *OSptr = (struct OSblock *) state->OSptr;
+      state->Reg[0] = sim_callback->rename (sim_callback, oldbuf, newbuf);
+      OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+    }
+}
+
 /* The emulator calls this routine when a SWI instruction is encuntered.
    The parameter passed is the SWI number (lower 24 bits of the instruction).  */
 
 unsigned
 ARMul_OSHandleSWI (ARMul_State * state, ARMword number)
 {
-  ARMword          addr;
-  ARMword          temp;
-  ARMword          saved_number = 0;
   struct OSblock * OSptr = (struct OSblock *) state->OSptr;
-  
-  /* Intel do not want DEMON SWI support.  */
-  if (state->is_XScale)
-    switch (number)
-    {
-    case SWI_Read:
-    case SWI_Write:
-    case SWI_Open:
-    case SWI_Clock:
-    case SWI_Time:
-    case SWI_Close:
-    case SWI_Flen:
-    case SWI_Exit:
-    case SWI_Seek:
-    case SWI_WriteC:
-    case SWI_Write0:
-    case SWI_GetErrno:
-    case SWI_GetEnv:
-      saved_number = number;
-      number = -1;
-    default:
-      break;
-    }
-  
+  int              unhandled = FALSE;
+
   switch (number)
     {
     case SWI_Read:
-      SWIread (state, state->Reg[0], state->Reg[1], state->Reg[2]);
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIread (state, state->Reg[0], state->Reg[1], state->Reg[2]);
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Write:
-      SWIwrite (state, state->Reg[0], state->Reg[1], state->Reg[2]);
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIwrite (state, state->Reg[0], state->Reg[1], state->Reg[2]);
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Open:
-      SWIopen (state, state->Reg[0], state->Reg[1]);
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIopen (state, state->Reg[0], state->Reg[1]);
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Clock:
-      /* Return number of centi-seconds.  */
-      state->Reg[0] =
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         /* Return number of centi-seconds.  */
+         state->Reg[0] =
 #ifdef CLOCKS_PER_SEC
-       (CLOCKS_PER_SEC >= 100)
-       ? (ARMword) (clock () / (CLOCKS_PER_SEC / 100))
-       : (ARMword) ((clock () * 100) / CLOCKS_PER_SEC);
+           (CLOCKS_PER_SEC >= 100)
+           ? (ARMword) (clock () / (CLOCKS_PER_SEC / 100))
+           : (ARMword) ((clock () * 100) / CLOCKS_PER_SEC);
 #else
-       /* Presume unix... clock() returns microseconds.  */
-       (ARMword) (clock () / 10000);
+         /* Presume unix... clock() returns microseconds.  */
+         (ARMword) (clock () / 10000);
 #endif
-      OSptr->ErrorNo = errno;
+         OSptr->ErrorNo = errno;
+       }
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Time:
-      state->Reg[0] = (ARMword) sim_callback->time (sim_callback, NULL);
-      OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         state->Reg[0] = (ARMword) sim_callback->time (sim_callback, NULL);
+         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+       }
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Close:
-      state->Reg[0] = sim_callback->close (sim_callback, state->Reg[0]);
-      OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         state->Reg[0] = sim_callback->close (sim_callback, state->Reg[0]);
+         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+       }
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Flen:
-      SWIflen (state, state->Reg[0]);
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIflen (state, state->Reg[0]);
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Exit:
-      state->Emulate = FALSE;
+      if (swi_mask & SWI_MASK_DEMON)
+       state->Emulate = FALSE;
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Seek:
-      /* We must return non-zero for failure.  */
-      state->Reg[0] = -1 >= sim_callback->lseek (sim_callback, state->Reg[0], state->Reg[1], SEEK_SET);
-      OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         /* We must return non-zero for failure.  */
+         state->Reg[0] = -1 >= sim_callback->lseek (sim_callback, state->Reg[0], state->Reg[1], SEEK_SET);
+         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+       }
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_WriteC:
-      {
-       char tmp = state->Reg[0];
-       (void) sim_callback->write_stdout (sim_callback, &tmp, 1);
-       OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-      }
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         char tmp = state->Reg[0];
+         (void) sim_callback->write_stdout (sim_callback, &tmp, 1);
+         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+       }
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Write0:
-      SWIWrite0 (state, state->Reg[0]);
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIWrite0 (state, state->Reg[0]);
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_GetErrno:
-      state->Reg[0] = OSptr->ErrorNo;
+      if (swi_mask & SWI_MASK_DEMON)
+       state->Reg[0] = OSptr->ErrorNo;
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_GetEnv:
-      state->Reg[0] = ADDRCMDLINE;
-      if (state->MemSize)
-       state->Reg[1] = state->MemSize;
-      else
-       state->Reg[1] = ADDRUSERSTACK;
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         state->Reg[0] = ADDRCMDLINE;
+         if (state->MemSize)
+           state->Reg[1] = state->MemSize;
+         else
+           state->Reg[1] = ADDRUSERSTACK;
 
-      WriteCommandLineTo (state, state->Reg[0]);
+         WriteCommandLineTo (state, state->Reg[0]);
+       }
+      else
+       unhandled = TRUE;
       break;
 
     case SWI_Breakpoint:
@@ -508,215 +524,318 @@ ARMul_OSHandleSWI (ARMul_State * state, ARMword number)
       state->Emulate = FALSE;
       break;
 
+    case SWI_Remove:
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIremove (state, state->Reg[0]);
+      else
+       unhandled = TRUE;
+      break;
+
+    case SWI_Rename:
+      if (swi_mask & SWI_MASK_DEMON)
+       SWIrename (state, state->Reg[0], state->Reg[1]);
+      else
+       unhandled = TRUE;
+      break;
+
+    case SWI_IsTTY:
+      if (swi_mask & SWI_MASK_DEMON)
+       {
+         state->Reg[0] = sim_callback->isatty (sim_callback, state->Reg[0]);
+         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+       }
+      else
+       unhandled = TRUE;
+      break;
+
       /* Handle Angel SWIs as well as Demon ones.  */
     case AngelSWI_ARM:
     case AngelSWI_Thumb:
-      /* R1 is almost always a parameter block.  */
-      addr = state->Reg[1];
-      /* R0 is a reason code.  */
-      switch (state->Reg[0])
+      if (swi_mask & SWI_MASK_ANGEL)
        {
-         /* Unimplemented reason codes.  */
-       case AngelSWI_Reason_ReadC:
-       case AngelSWI_Reason_IsTTY:
-       case AngelSWI_Reason_TmpNam:
-       case AngelSWI_Reason_Remove:
-       case AngelSWI_Reason_Rename:
-       case AngelSWI_Reason_System:
-       case AngelSWI_Reason_EnterSVC:
-       default:
-         state->Emulate = FALSE;
-         return FALSE;
-
-       case AngelSWI_Reason_Clock:
-         /* Return number of centi-seconds.  */
-         state->Reg[0] =
+         ARMword addr;
+         ARMword temp;
+
+         /* R1 is almost always a parameter block.  */
+         addr = state->Reg[1];
+         /* R0 is a reason code.  */
+         switch (state->Reg[0])
+           {
+           case -1:
+             /* This can happen when a SWI is interrupted (eg receiving a
+                ctrl-C whilst processing SWIRead()).  The SWI will complete
+                returning -1 in r0 to the caller.  If GDB is then used to
+                resume the system call the reason code will now be -1.  */
+             return TRUE;
+
+             /* Unimplemented reason codes.  */
+           case AngelSWI_Reason_ReadC:
+           case AngelSWI_Reason_TmpNam:
+           case AngelSWI_Reason_System:
+           case AngelSWI_Reason_EnterSVC:
+           default:
+             state->Emulate = FALSE;
+             return FALSE;
+
+           case AngelSWI_Reason_Clock:
+             /* Return number of centi-seconds.  */
+             state->Reg[0] =
 #ifdef CLOCKS_PER_SEC
-           (CLOCKS_PER_SEC >= 100)
-           ? (ARMword) (clock () / (CLOCKS_PER_SEC / 100))
-           : (ARMword) ((clock () * 100) / CLOCKS_PER_SEC);
+               (CLOCKS_PER_SEC >= 100)
+               ? (ARMword) (clock () / (CLOCKS_PER_SEC / 100))
+               : (ARMword) ((clock () * 100) / CLOCKS_PER_SEC);
 #else
-           /* Presume unix... clock() returns microseconds.  */
-           (ARMword) (clock () / 10000);
+             /* Presume unix... clock() returns microseconds.  */
+             (ARMword) (clock () / 10000);
 #endif
-         OSptr->ErrorNo = errno;
-         break;
-
-       case AngelSWI_Reason_Time:
-         state->Reg[0] = (ARMword) sim_callback->time (sim_callback, NULL);
-         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         break;
-
-       case AngelSWI_Reason_WriteC:
-         {
-           char tmp = ARMul_SafeReadByte (state, addr);
-           (void) sim_callback->write_stdout (sim_callback, &tmp, 1);
-           OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         }
-         /* Fall thgrough.  */
-
-       case AngelSWI_Reason_Write0:
-         SWIWrite0 (state, addr);
-         break;
-
-       case AngelSWI_Reason_Close:
-         state->Reg[0] = sim_callback->close (sim_callback, ARMul_ReadWord (state, addr));
-         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         break;
-
-       case AngelSWI_Reason_Seek:
-         state->Reg[0] = -1 >= sim_callback->lseek (sim_callback, ARMul_ReadWord (state, addr),
-                                      ARMul_ReadWord (state, addr + 4),
-                                      SEEK_SET);
-         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         break;
-
-       case AngelSWI_Reason_FLen:
-         SWIflen (state, ARMul_ReadWord (state, addr));
-         break;
-
-       case AngelSWI_Reason_GetCmdLine:
-         WriteCommandLineTo (state, ARMul_ReadWord (state, addr));
-         break;
-
-       case AngelSWI_Reason_HeapInfo:
-         /* R1 is a pointer to a pointer.  */
-         addr = ARMul_ReadWord (state, addr);
-
-         /* Pick up the right memory limit.  */
-         if (state->MemSize)
-           temp = state->MemSize;
-         else
-           temp = ADDRUSERSTACK;
-
-         ARMul_WriteWord (state, addr, 0);             /* Heap base.  */
-         ARMul_WriteWord (state, addr + 4, temp);      /* Heap limit.  */
-         ARMul_WriteWord (state, addr + 8, temp);      /* Stack base.  */
-         ARMul_WriteWord (state, addr + 12, temp);     /* Stack limit.  */
-         break;
-
-       case AngelSWI_Reason_ReportException:
-         if (state->Reg[1] == ADP_Stopped_ApplicationExit)
-           state->Reg[0] = 0;
-         else
-           state->Reg[0] = -1;
-         state->Emulate = FALSE;
-         break;
-
-       case ADP_Stopped_ApplicationExit:
-         state->Reg[0] = 0;
-         state->Emulate = FALSE;
-         break;
-
-       case ADP_Stopped_RunTimeError:
-         state->Reg[0] = -1;
-         state->Emulate = FALSE;
-         break;
-
-       case AngelSWI_Reason_Errno:
-         state->Reg[0] = OSptr->ErrorNo;
-         break;
-
-       case AngelSWI_Reason_Open:
-         SWIopen (state,
-                  ARMul_ReadWord (state, addr),
-                  ARMul_ReadWord (state, addr + 4));
-         break;
-
-       case AngelSWI_Reason_Read:
-         SWIread (state,
-                  ARMul_ReadWord (state, addr),
-                  ARMul_ReadWord (state, addr + 4),
-                  ARMul_ReadWord (state, addr + 8));
-         break;
-
-       case AngelSWI_Reason_Write:
-         SWIwrite (state,
-                   ARMul_ReadWord (state, addr),
-                   ARMul_ReadWord (state, addr + 4),
-                   ARMul_ReadWord (state, addr + 8));
-         break;
+             OSptr->ErrorNo = errno;
+             break;
+
+           case AngelSWI_Reason_Time:
+             state->Reg[0] = (ARMword) sim_callback->time (sim_callback, NULL);
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case AngelSWI_Reason_WriteC:
+             {
+               char tmp = ARMul_SafeReadByte (state, addr);
+               (void) sim_callback->write_stdout (sim_callback, &tmp, 1);
+               OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+               break;
+             }
+
+           case AngelSWI_Reason_Write0:
+             SWIWrite0 (state, addr);
+             break;
+
+           case AngelSWI_Reason_Close:
+             state->Reg[0] = sim_callback->close (sim_callback, ARMul_ReadWord (state, addr));
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case AngelSWI_Reason_Seek:
+             state->Reg[0] = -1 >= sim_callback->lseek (sim_callback, ARMul_ReadWord (state, addr),
+                                                        ARMul_ReadWord (state, addr + 4),
+                                                        SEEK_SET);
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case AngelSWI_Reason_FLen:
+             SWIflen (state, ARMul_ReadWord (state, addr));
+             break;
+
+           case AngelSWI_Reason_GetCmdLine:
+             WriteCommandLineTo (state, ARMul_ReadWord (state, addr));
+             break;
+
+           case AngelSWI_Reason_HeapInfo:
+             /* R1 is a pointer to a pointer.  */
+             addr = ARMul_ReadWord (state, addr);
+
+             /* Pick up the right memory limit.  */
+             if (state->MemSize)
+               temp = state->MemSize;
+             else
+               temp = ADDRUSERSTACK;
+
+             ARMul_WriteWord (state, addr, 0);         /* Heap base.  */
+             ARMul_WriteWord (state, addr + 4, temp);  /* Heap limit.  */
+             ARMul_WriteWord (state, addr + 8, temp);  /* Stack base.  */
+             ARMul_WriteWord (state, addr + 12, temp); /* Stack limit.  */
+             break;
+
+           case AngelSWI_Reason_ReportException:
+             if (state->Reg[1] == ADP_Stopped_ApplicationExit)
+               state->Reg[0] = 0;
+             else
+               state->Reg[0] = -1;
+             state->Emulate = FALSE;
+             break;
+
+           case ADP_Stopped_ApplicationExit:
+             state->Reg[0] = 0;
+             state->Emulate = FALSE;
+             break;
+
+           case ADP_Stopped_RunTimeError:
+             state->Reg[0] = -1;
+             state->Emulate = FALSE;
+             break;
+
+           case AngelSWI_Reason_Errno:
+             state->Reg[0] = OSptr->ErrorNo;
+             break;
+
+           case AngelSWI_Reason_Open:
+             SWIopen (state,
+                      ARMul_ReadWord (state, addr),
+                      ARMul_ReadWord (state, addr + 4));
+             break;
+
+           case AngelSWI_Reason_Read:
+             SWIread (state,
+                      ARMul_ReadWord (state, addr),
+                      ARMul_ReadWord (state, addr + 4),
+                      ARMul_ReadWord (state, addr + 8));
+             break;
+
+           case AngelSWI_Reason_Write:
+             SWIwrite (state,
+                       ARMul_ReadWord (state, addr),
+                       ARMul_ReadWord (state, addr + 4),
+                       ARMul_ReadWord (state, addr + 8));
+             break;
+
+           case AngelSWI_Reason_IsTTY:
+             state->Reg[0] = sim_callback->isatty (sim_callback,
+                                                   ARMul_ReadWord (state, addr));
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case AngelSWI_Reason_Remove:
+             SWIremove (state,
+                        ARMul_ReadWord (state, addr));
+
+           case AngelSWI_Reason_Rename:
+             SWIrename (state,
+                        ARMul_ReadWord (state, addr),
+                        ARMul_ReadWord (state, addr + 4));
+           }
        }
-
-    case 0x90:
-    case 0x91:
-    case 0x92:
-      /* These are used by the FPE code.  */
+      else
+       unhandled = TRUE;
       break;
-      
-    case 0x180001: /* RedBoot's Syscall SWI in ARM mode.  */
-      switch (state->Reg[0])
-       {
-         /* These numbers are defined in libgloss/syscall.h
-            but the simulator should not be dependend upon
-            libgloss being installed.  */
-       case 1:  /* Exit.  */
-         state->Emulate = FALSE;
-         return TRUE;
-
-       case 2:  /* Open.  */
-         SWIopen (state, state->Reg[1], state->Reg[2]);
-         return TRUE;
-
-       case 3:  /* Close.  */
-         state->Reg[0] = sim_callback->close (sim_callback, state->Reg[1]);
-         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         return TRUE;
 
-       case 4:  /* Read.  */
-         SWIread (state, state->Reg[1], state->Reg[2], state->Reg[3]);
-         return TRUE;
+      /* The following SWIs are generated by the softvectorcode[]
+        installed by default by the simulator.  */
+    case 0x91: /* Undefined Instruction.  */
+      {
+       ARMword addr = state->RegBank[UNDEFBANK][14] - 4;
+       
+       sim_callback->printf_filtered
+         (sim_callback, "sim: exception: Unhandled Instruction '0x%08x' at 0x%08x.  Stopping.\n",
+          ARMul_ReadWord (state, addr), addr);
+       state->EndCondition = RDIError_SoftwareInterrupt;
+       state->Emulate = FALSE;
+       return FALSE;
+      }
 
-       case 5:  /* Write.  */
-         SWIwrite (state, state->Reg[1], state->Reg[2], state->Reg[3]);
-         return TRUE;
+    case 0x90: /* Reset.  */
+    case 0x92: /* SWI.  */
+      /* These two can be safely ignored.  */
+      break;
 
-       case 6:  /* Lseek.  */
-         state->Reg[0] = sim_callback->lseek (sim_callback,
-                                              state->Reg[1],
-                                              state->Reg[2],
-                                              state->Reg[3]);
-         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         return TRUE;
+    case 0x93: /* Prefetch Abort.  */
+    case 0x94: /* Data Abort.  */
+    case 0x95: /* Address Exception.  */
+    case 0x96: /* IRQ.  */
+    case 0x97: /* FIQ.  */
+    case 0x98: /* Error.  */
+      unhandled = TRUE;
+      break;
 
-       case 17: /* Utime.  */
-         state->Reg[0] = (ARMword) sim_callback->time (sim_callback,
-                                                       (long *) state->Reg[1]);
-         OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
-         return TRUE;
-
-       case 7:  /* Unlink.  */
-       case 8:  /* Getpid.  */
-       case 9:  /* Kill.  */
-       case 10: /* Fstat.  */
-       case 11: /* Sbrk.  */
-       case 12: /* Argvlen.  */
-       case 13: /* Argv.  */
-       case 14: /* ChDir.  */
-       case 15: /* Stat.  */
-       case 16: /* Chmod.  */
-       case 18: /* Time.  */
-         sim_callback->printf_filtered
-           (sim_callback,
-            "sim: unhandled RedBoot syscall '%d' encountered - ignoring\n",
-            state->Reg[0]);
-         return FALSE;
+    case -1:
+      /* This can happen when a SWI is interrupted (eg receiving a
+        ctrl-C whilst processing SWIRead()).  The SWI will complete
+        returning -1 in r0 to the caller.  If GDB is then used to
+        resume the system call the reason code will now be -1.  */
+      return TRUE;
 
-       default:
-         sim_callback->printf_filtered
-           (sim_callback,
-            "sim: unknown RedBoot syscall '%d' encountered - ignoring\n",
-            state->Reg[0]);
-         return FALSE;
+    case 0x180001: /* RedBoot's Syscall SWI in ARM mode.  */
+      if (swi_mask & SWI_MASK_REDBOOT)
+       {
+         switch (state->Reg[0])
+           {
+             /* These numbers are defined in libgloss/syscall.h
+                but the simulator should not be dependend upon
+                libgloss being installed.  */
+           case 1:  /* Exit.  */
+             state->Emulate = FALSE;
+             /* Copy exit code into r0.  */
+             state->Reg[0] = state->Reg[1];
+             break;
+
+           case 2:  /* Open.  */
+             SWIopen (state, state->Reg[1], state->Reg[2]);
+             break;
+
+           case 3:  /* Close.  */
+             state->Reg[0] = sim_callback->close (sim_callback, state->Reg[1]);
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case 4:  /* Read.  */
+             SWIread (state, state->Reg[1], state->Reg[2], state->Reg[3]);
+             break;
+
+           case 5:  /* Write.  */
+             SWIwrite (state, state->Reg[1], state->Reg[2], state->Reg[3]);
+             break;
+
+           case 6:  /* Lseek.  */
+             state->Reg[0] = sim_callback->lseek (sim_callback,
+                                                  state->Reg[1],
+                                                  state->Reg[2],
+                                                  state->Reg[3]);
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case 17: /* Utime.  */
+             state->Reg[0] = state->Reg[1] = (ARMword) sim_callback->time (sim_callback, NULL);
+             OSptr->ErrorNo = sim_callback->get_errno (sim_callback);
+             break;
+
+           case 7:  /* Unlink.  */
+           case 8:  /* Getpid.  */
+           case 9:  /* Kill.  */
+           case 10: /* Fstat.  */
+           case 11: /* Sbrk.  */
+           case 12: /* Argvlen.  */
+           case 13: /* Argv.  */
+           case 14: /* ChDir.  */
+           case 15: /* Stat.  */
+           case 16: /* Chmod.  */
+           case 18: /* Time.  */
+             sim_callback->printf_filtered
+               (sim_callback,
+                "sim: unhandled RedBoot syscall `%d' encountered - "
+                "returning ENOSYS\n",
+                state->Reg[0]);
+             state->Reg[0] = -1;
+             OSptr->ErrorNo = cb_host_to_target_errno
+               (sim_callback, ENOSYS);
+             break;
+           case 1001: /* Meminfo. */
+             {
+               ARMword totmem = state->Reg[1],
+                       topmem = state->Reg[2];
+               ARMword stack = state->MemSize > 0
+                 ? state->MemSize : ADDRUSERSTACK;
+               if (totmem != 0)
+                 ARMul_WriteWord (state, totmem, stack);
+               if (topmem != 0)
+                 ARMul_WriteWord (state, topmem, stack);
+               state->Reg[0] = 0;
+               break;
+             }
+
+           default:
+             sim_callback->printf_filtered
+               (sim_callback,
+                "sim: unknown RedBoot syscall '%d' encountered - ignoring\n",
+                state->Reg[0]);
+             return FALSE;
+           }
+         break;
        }
-      return TRUE;
-      
+
     default:
-      /* If there is a SWI vector installed use it.  */
-      if (state->is_XScale && saved_number != -1)
-       number = saved_number;
-           
-      if (SWI_vector_installed && number != SWI_Breakpoint)
+      unhandled = TRUE;
+    }
+
+  if (unhandled)
+    {
+      if (SWI_vector_installed)
        {
          ARMword cpsr;
          ARMword i_size;
@@ -747,22 +866,3 @@ ARMul_OSHandleSWI (ARMul_State * state, ARMword number)
 
   return TRUE;
 }
-
-#ifndef NOOS
-#ifndef ASIM
-
-/* The emulator calls this routine when an Exception occurs.  The second
-   parameter is the address of the relevant exception vector.  Returning
-   FALSE from this routine causes the trap to be taken, TRUE causes it to
-   be ignored (so set state->Emulate to FALSE!).  */
-
-unsigned
-ARMul_OSException (ARMul_State * state  ATTRIBUTE_UNUSED,
-                  ARMword       vector ATTRIBUTE_UNUSED,
-                  ARMword       pc     ATTRIBUTE_UNUSED)
-{
-  return FALSE;
-}
-
-#endif
-#endif /* NOOS */