Commit 5e6ebacc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier/tags/m68k-next-pull-request' into staging 



remove m68k simulator syscall interface
Fix comments format
Fix gdbstub

# gpg: Signature made Wed 26 Jun 2019 17:20:41 BST
# gpg:                using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg:                issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-next-pull-request:
  linux-user/m68k: remove simulator syscall interface
  m68k comments break patch submission due to being incorrectly formatted
  The m68k gdbstub SR reg request doesnt include Condition-Codes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents ae9108f8 c6d0700f

linux-user/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -8,4 +8,3 @@ obj-$(TARGET_I386) += vm86.o 
obj-$(TARGET_ARM) += arm/nwfpe/

obj-$(TARGET_ARM) += arm/semihost.o

obj-$(TARGET_AARCH64) += arm/semihost.o
 
obj-$(TARGET_M68K) += m68k-sim.o

linux-user/m68k-sim.c

deleted100644 → 0
+0 −163
Original line number Diff line number Diff line 
/*

 *  m68k simulator syscall interface

 *

 *  Copyright (c) 2005 CodeSourcery, LLC. Written by Paul Brook.

 *

 *  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

 *  (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, see <http://www.gnu.org/licenses/>.

 */



#include "qemu/osdep.h"



#include "qemu.h"



#define SYS_EXIT        1

#define SYS_READ        3

#define SYS_WRITE       4

#define SYS_OPEN        5

#define SYS_CLOSE       6

#define SYS_BRK         17

#define SYS_FSTAT       28

#define SYS_ISATTY      29

#define SYS_LSEEK       199



struct m68k_sim_stat {

    uint16_t sim_st_dev;

    uint16_t sim_st_ino;

    uint32_t sim_st_mode;

    uint16_t sim_st_nlink;

    uint16_t sim_st_uid;

    uint16_t sim_st_gid;

    uint16_t sim_st_rdev;

    uint32_t sim_st_size;

    uint32_t sim_st_atime;

    uint32_t sim_st_mtime;

    uint32_t sim_st_ctime;

    uint32_t sim_st_blksize;

    uint32_t sim_st_blocks;

};



static inline uint32_t check_err(CPUM68KState *env, uint32_t code)

{

  env->dregs[0] = code;

  if (code == (uint32_t)-1) {

      env->dregs[1] = errno;

  } else {

      env->dregs[1] = 0;

  }

  return code;

}



#define SIM_O_APPEND    0x0008

#define SIM_O_CREAT     0x0200

#define SIM_O_TRUNC     0x0400

#define SIM_O_EXCL      0x0800

#define SIM_O_NONBLOCK  0x4000

#define SIM_O_NOCTTY    0x8000

#define SIM_O_SYNC      0x2000



static int translate_openflags(int flags)

{

    int hf;



    switch (flags & 3) {

    case 0: hf = O_RDONLY; break;

    case 1: hf = O_WRONLY; break;

    case 2: hf = O_RDWR; break;

    default: hf = O_RDWR; break;

    }



    if (flags & SIM_O_APPEND) hf |= O_APPEND;

    if (flags & SIM_O_CREAT) hf |= O_CREAT;

    if (flags & SIM_O_TRUNC) hf |= O_TRUNC;

    if (flags & SIM_O_EXCL) hf |= O_EXCL;

    if (flags & SIM_O_NONBLOCK) hf |= O_NONBLOCK;

    if (flags & SIM_O_NOCTTY) hf |= O_NOCTTY;

    if (flags & SIM_O_SYNC) hf |= O_SYNC;



    return hf;

}



#define ARG(x) tswap32(args[x])

void do_m68k_simcall(CPUM68KState *env, int nr)

{

    uint32_t *args;



    args = (uint32_t *)(unsigned long)(env->aregs[7] + 4);

    switch (nr) {

    case SYS_EXIT:

        exit(ARG(0));

    case SYS_READ:

        check_err(env, read(ARG(0), (void *)(unsigned long)ARG(1), ARG(2)));

        break;

    case SYS_WRITE:

        check_err(env, write(ARG(0), (void *)(unsigned long)ARG(1), ARG(2)));

        break;

    case SYS_OPEN:

        check_err(env, open((char *)(unsigned long)ARG(0),

                            translate_openflags(ARG(1)), ARG(2)));

        break;

    case SYS_CLOSE:

        {

            /* Ignore attempts to close stdin/out/err.  */

            int fd = ARG(0);

            if (fd > 2)

              check_err(env, close(fd));

            else

              check_err(env, 0);

            break;

        }

    case SYS_BRK:

        {

            int32_t ret;



            ret = do_brk((abi_ulong)ARG(0));

            if (ret == -ENOMEM)

                ret = -1;

            check_err(env, ret);

        }

        break;

    case SYS_FSTAT:

        {

            struct stat s;

            int rc;

            struct m68k_sim_stat *p;

            rc = check_err(env, fstat(ARG(0), &s));

            if (rc == 0) {

                p = (struct m68k_sim_stat *)(unsigned long)ARG(1);

                p->sim_st_dev = tswap16(s.st_dev);

                p->sim_st_ino = tswap16(s.st_ino);

                p->sim_st_mode = tswap32(s.st_mode);

                p->sim_st_nlink = tswap16(s.st_nlink);

                p->sim_st_uid = tswap16(s.st_uid);

                p->sim_st_gid = tswap16(s.st_gid);

                p->sim_st_rdev = tswap16(s.st_rdev);

                p->sim_st_size = tswap32(s.st_size);

                p->sim_st_atime = tswap32(s.st_atime);

                p->sim_st_mtime = tswap32(s.st_mtime);

                p->sim_st_ctime = tswap32(s.st_ctime);

                p->sim_st_blksize = tswap32(s.st_blksize);

                p->sim_st_blocks = tswap32(s.st_blocks);

            }

        }

        break;

    case SYS_ISATTY:

        check_err(env, isatty(ARG(0)));

        break;

    case SYS_LSEEK:

        check_err(env, lseek(ARG(0), (int32_t)ARG(1), ARG(2)));

        break;

    default:

        cpu_abort(env_cpu(env), "Unsupported m68k sim syscall %d\n", nr);

    }

}

linux-user/m68k/cpu_loop.c

+1 −16
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ void cpu_loop(CPUM68KState *env) 
    int trapnr;

    unsigned int n;

    target_siginfo_t info;

    TaskState *ts = cs->opaque;



    for(;;) {

        cpu_exec_start(cs);
@@ -37,26 +36,14 @@ void cpu_loop(CPUM68KState *env) 
        process_queued_cpu_work(cs);



        switch(trapnr) {

        case EXCP_ILLEGAL:

            {

                if (ts->sim_syscalls) {

                    uint16_t nr;

                    get_user_u16(nr, env->pc + 2);

                    env->pc += 4;

                    do_m68k_simcall(env, nr);

                } else {

                    goto do_sigill;

                }

            }

            break;

        case EXCP_HALT_INSN:

            /* Semihosing syscall.  */

            env->pc += 4;

            do_m68k_semihosting(env, env->dregs[0]);

            break;

        case EXCP_ILLEGAL:

        case EXCP_LINEA:

        case EXCP_LINEF:

        do_sigill:

            info.si_signo = TARGET_SIGILL;

            info.si_errno = 0;

            info.si_code = TARGET_ILL_ILLOPN;
@@ -80,7 +67,6 @@ void cpu_loop(CPUM68KState *env) 
        case EXCP_TRAP0:

            {

                abi_long ret;

                ts->sim_syscalls = 0;

                n = env->dregs[0];

                env->pc += 2;

                ret = do_syscall(env,
@@ -154,7 +140,6 @@ void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) 
    env->aregs[7] = regs->usp;

    env->sr = regs->sr;



    ts->sim_syscalls = 1;

    ts->stack_base = info->start_stack;

    ts->heap_base = info->brk;

    /* This will be filled in on the first SYS_HEAPINFO call.  */

linux-user/m68k/target_syscall.h

+0 −2
Original line number Diff line number Diff line
@@ -26,6 +26,4 @@ struct target_pt_regs { 


#define TARGET_WANT_OLD_SYS_SELECT



void do_m68k_simcall(CPUM68KState *, int);



#endif /* M68K_TARGET_SYSCALL_H */

linux-user/qemu.h

+0 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ typedef struct TaskState { 
#endif

    abi_ulong child_tidptr;

#ifdef TARGET_M68K

    int sim_syscalls;

    abi_ulong tp_value;

#endif

#if defined(TARGET_ARM) || defined(TARGET_M68K)