* simops.c (OP_5F00): Fix problems with system calls.

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index a41fe95e16a052e8a27b54057fd9282e7fca3f93..25d1b1bf4482d340b1b0982b12a74ba30c650cad 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 12 12:50:11 1996  Mark Alexander  <marka@cygnus.com>
+
+       * simops.c (OP_5F00): Fix problems with system calls.
+
 Thu Sep 12 12:19:28 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
 
        * simops.c (OP_5F00): Correct tracing information for trap.

diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
index 8c7342dee32f29c78cbf9813f498de774d0c747b..5b5d70ff8077bb8ae9d985d90e88f95f4e2b3a08 100644 (file)
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -2436,15 +2436,18 @@ OP_5F00 ()
 
 /* Registers passed to trap 0 */
 
-#define FUNC   State.regs[2]   /* function number, return value */
-#define PARM1  State.regs[3]   /* optional parm 1 */
-#define PARM2  State.regs[4]   /* optional parm 2 */
-#define PARM3  State.regs[5]   /* optional parm 3 */
+#define FUNC   State.regs[6]   /* function number */
+#define PARM1  State.regs[2]   /* optional parm 1 */
+#define PARM2  State.regs[3]   /* optional parm 2 */
+#define PARM3  State.regs[4]   /* optional parm 3 */
+#define PARM4  State.regs[5]   /* optional parm 3 */
 
 /* Registers set by trap 0 */
 
-#define RETVAL State.regs[2]   /* return value */
-#define RETERR State.regs[3]   /* return error code */
+#define RETVAL State.regs[2]           /* return value */
+#define RETVAL_HIGH State.regs[2]      /* return value */
+#define RETVAL_LOW  State.regs[3]      /* return value */
+#define RETERR State.regs[4]           /* return error code */
 
 /* Turn a pointer in a register into a pointer into real memory. */
 
@@ -2453,23 +2456,16 @@ OP_5F00 ()
        switch (FUNC)
          {
 #if !defined(__GO32__) && !defined(_WIN32)
-#ifdef SYS_fork
          case SYS_fork:
            RETVAL = fork ();
            break;
-#endif
-#ifdef SYS_execve
          case SYS_execve:
            RETVAL = execve (MEMPTR (PARM1), (char **) MEMPTR (PARM2),
                             (char **)MEMPTR (PARM3));
            break;
-#endif
-#ifdef SYS_execv
          case SYS_execv:
            RETVAL = execve (MEMPTR (PARM1), (char **) MEMPTR (PARM2), NULL);
            break;
-#endif
-#ifdef SYS_pipe
          case SYS_pipe:
            {
              reg_t buf;
@@ -2482,8 +2478,6 @@ OP_5F00 ()
              SW (buf, host_fd[1]);
            }
          break;
-#endif
-#ifdef SYS_wait
          case SYS_wait:
            {
              int status;
@@ -2493,15 +2487,10 @@ OP_5F00 ()
            }
          break;
 #endif
-#endif
-
-#ifdef SYS_read
          case SYS_read:
            RETVAL = d10v_callback->read (d10v_callback, PARM1, MEMPTR (PARM2),
                                          PARM3);
            break;
-#endif
-#ifdef SYS_write
          case SYS_write:
            if (PARM1 == 1)
              RETVAL = (int)d10v_callback->write_stdout (d10v_callback,
@@ -2510,31 +2499,27 @@ OP_5F00 ()
              RETVAL = (int)d10v_callback->write (d10v_callback, PARM1,
                                                  MEMPTR (PARM2), PARM3);
            break;
-#endif
-#ifdef SYS_lseek
          case SYS_lseek:
-           RETVAL = d10v_callback->lseek (d10v_callback, PARM1, PARM2, PARM3);
+           {
+             unsigned long ret = d10v_callback->lseek (d10v_callback, PARM1,
+                       (((unsigned long)PARM2) << 16) || (unsigned long)PARM3,
+                       PARM4);
+             RETVAL_HIGH = ret >> 16;
+             RETVAL_LOW  = ret & 0xffff;
+           }
            break;
-#endif
-#ifdef SYS_close
          case SYS_close:
            RETVAL = d10v_callback->close (d10v_callback, PARM1);
            break;
-#endif
-#ifdef SYS_open
          case SYS_open:
            RETVAL = d10v_callback->open (d10v_callback, MEMPTR (PARM1), PARM2);
            break;
-#endif
-#ifdef SYS_exit
          case SYS_exit:
            /* EXIT - caller can look in PARM1 to work out the 
               reason */
            State.exception = SIGQUIT;
            break;
-#endif
 
-#ifdef SYS_stat
          case SYS_stat:
            /* stat system call */
            {
@@ -2561,30 +2546,22 @@ OP_5F00 ()
              SLW (buf+36, host_stat.st_ctime);
            }
            break;
-#endif
 
-#ifdef SYS_chown
          case SYS_chown:
            RETVAL = chown (MEMPTR (PARM1), PARM2, PARM3);
            break;
-#endif
-#ifdef SYS_chmod
          case SYS_chmod:
            RETVAL = chmod (MEMPTR (PARM1), PARM2);
            break;
-#endif
-#ifdef SYS_utime
          case SYS_utime:
            /* Cast the second argument to void *, to avoid type mismatch
               if a prototype is present.  */
            RETVAL = utime (MEMPTR (PARM1), (void *) MEMPTR (PARM2));
            break;
-#endif
          default:
            abort ();
          }
-       RETERR = errno;
-       errno = save_errno;
+       RETERR = d10v_callback->get_errno(d10v_callback);
        break;
       }