Commit 65dfad62 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/xtensa/tags/20170606-xtensa' into staging 



target/xtensa fixes:

- fix read/write simcall mapping flags and return value;
- use -serial option to direct console output of sim machine to QEMU chardev;
- fix handling of unknown registers in the gdbstub.

# gpg: Signature made Tue 06 Jun 2017 11:46:05 BST
# gpg:                using RSA key 0x51F9CC91F83FA044
# gpg: Good signature from "Max Filippov <filippov@cadence.com>"
# gpg:                 aka "Max Filippov <max.filippov@cogentembedded.com>"
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>"
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB  17D8 51F9 CC91 F83F A044

* remotes/xtensa/tags/20170606-xtensa:
  target/xtensa: handle unknown registers in gdbstub
  target/xtensa: support output to chardev console
  target/xtensa: fix return value of read/write simcalls
  target/xtensa: fix mapping direction in read/write simcalls

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 572db7cd dd7b952b

hw/xtensa/sim.c

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,9 @@ static void xtensa_sim_init(MachineState *machine) 
        xtensa_create_memory_regions(&sysram, "xtensa.sysram");

    }



    if (serial_hds[0]) {

        xtensa_sim_open_console(serial_hds[0]);

    }

    if (kernel_filename) {

        uint64_t elf_entry;

        uint64_t elf_lowaddr;
@@ -136,6 +139,7 @@ static void xtensa_sim_machine_init(MachineClass *mc) 
    mc->is_default = true;

    mc->init = xtensa_sim_init;

    mc->max_cpus = 4;

    mc->no_serial = 1;

}



DEFINE_MACHINE("sim", xtensa_sim_machine_init)

target/xtensa/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ void xtensa_translate_init(void); 
void xtensa_breakpoint_handler(CPUState *cs);

void xtensa_finalize_config(XtensaConfig *config);

void xtensa_register_core(XtensaConfigList *node);

void xtensa_sim_open_console(Chardev *chr);

void check_interrupts(CPUXtensaState *s);

void xtensa_irq_init(CPUXtensaState *env);

void *xtensa_get_extint(CPUXtensaState *env, unsigned extint);

target/xtensa/gdbstub.c

+10 −3
Original line number Diff line number Diff line
@@ -58,7 +58,10 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) 
        case 8:

            return gdb_get_reg64(mem_buf, float64_val(env->fregs[i].f64));

        default:

            return 0;

            qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported size %d\n",

                          __func__, n, reg->size);

            memset(mem_buf, 0, reg->size);

            return reg->size;

        }



    case 8: /*a*/
@@ -67,6 +70,8 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n) 
    default:

        qemu_log_mask(LOG_UNIMP, "%s from reg %d of unsupported type %d\n",

                      __func__, n, reg->type);

        memset(mem_buf, 0, reg->size);

        return reg->size;

        return 0;

    }

}
@@ -111,7 +116,9 @@ int xtensa_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) 
            env->fregs[reg->targno & 0x0f].f64 = make_float64(tmp);

            return 8;

        default:

            return 0;

            qemu_log_mask(LOG_UNIMP, "%s to reg %d of unsupported size %d\n",

                          __func__, n, reg->size);

            return reg->size;

        }



    case 8: /*a*/
@@ -121,7 +128,7 @@ int xtensa_cpu_gdb_write_register(CPUState *cs, uint8_t *mem_buf, int n) 
    default:

        qemu_log_mask(LOG_UNIMP, "%s to reg %d of unsupported type %d\n",

                      __func__, n, reg->type);

        return 0;

        return reg->size;

    }



    return 4;

target/xtensa/xtensa-semi.c

+72 −19
Original line number Diff line number Diff line
@@ -27,9 +27,14 @@ 


#include "qemu/osdep.h"

#include "cpu.h"

#include "chardev/char-fe.h"

#include "exec/helper-proto.h"

#include "exec/semihost.h"

#include "qapi/error.h"

#include "qemu/log.h"

#include "sysemu/sysemu.h"



static CharBackend *xtensa_sim_console;



enum {

    TARGET_SYS_exit = 1,
@@ -148,6 +153,15 @@ static uint32_t errno_h2g(int host_errno) 
    }

}



void xtensa_sim_open_console(Chardev *chr)

{

    static CharBackend console;



    qemu_chr_fe_init(&console, chr, &error_abort);

    qemu_chr_fe_set_handlers(&console, NULL, NULL, NULL, NULL, NULL, true);

    xtensa_sim_console = &console;

}



void HELPER(simcall)(CPUXtensaState *env)

{

    CPUState *cs = CPU(xtensa_env_get_cpu(env));
@@ -166,6 +180,7 @@ void HELPER(simcall)(CPUXtensaState *env) 
            uint32_t fd = regs[3];

            uint32_t vaddr = regs[4];

            uint32_t len = regs[5];

            uint32_t len_done = 0;



            while (len > 0) {

                hwaddr paddr = cpu_get_phys_page_debug(cs, vaddr);
@@ -173,25 +188,54 @@ void HELPER(simcall)(CPUXtensaState *env) 
                    TARGET_PAGE_SIZE - (vaddr & (TARGET_PAGE_SIZE - 1));

                uint32_t io_sz = page_left < len ? page_left : len;

                hwaddr sz = io_sz;

                void *buf = cpu_physical_memory_map(paddr, &sz, is_write);

                void *buf = cpu_physical_memory_map(paddr, &sz, !is_write);

                uint32_t io_done;

                bool error = false;



                if (buf) {

                    vaddr += io_sz;

                    len -= io_sz;

                    regs[2] = is_write ?

                    if (fd < 3 && xtensa_sim_console) {

                        if (is_write && (fd == 1 || fd == 2)) {

                            io_done = qemu_chr_fe_write_all(xtensa_sim_console,

                                                            buf, io_sz);

                            regs[3] = errno_h2g(errno);

                        } else {

                            qemu_log_mask(LOG_GUEST_ERROR,

                                          "%s fd %d is not supported with chardev console\n",

                                          is_write ?

                                          "writing to" : "reading from", fd);

                            io_done = -1;

                            regs[3] = TARGET_EBADF;

                        }

                    } else {

                        io_done = is_write ?

                            write(fd, buf, io_sz) :

                            read(fd, buf, io_sz);

                        regs[3] = errno_h2g(errno);

                    cpu_physical_memory_unmap(buf, sz, is_write, sz);

                    if (regs[2] == -1) {

                        break;

                    }

                    if (io_done == -1) {

                        error = true;

                        io_done = 0;

                    }

                    cpu_physical_memory_unmap(buf, sz, !is_write, io_done);

                } else {

                    regs[2] = -1;

                    error = true;

                    regs[3] = TARGET_EINVAL;

                    break;

                }

                if (error) {

                    if (!len_done) {

                        len_done = -1;

                    }

                    break;

                }

                len_done += io_done;

                if (io_done < io_sz) {

                    break;

                }

            }

            regs[2] = len_done;

        }

        break;
@@ -241,10 +285,6 @@ void HELPER(simcall)(CPUXtensaState *env) 
            uint32_t target_tvv[2];



            struct timeval tv = {0};

            fd_set fdset;



            FD_ZERO(&fdset);

            FD_SET(fd, &fdset);



            if (target_tv) {

                cpu_memory_rw_debug(cs, target_tv,
@@ -252,6 +292,18 @@ void HELPER(simcall)(CPUXtensaState *env) 
                tv.tv_sec = (int32_t)tswap32(target_tvv[0]);

                tv.tv_usec = (int32_t)tswap32(target_tvv[1]);

            }

            if (fd < 3 && xtensa_sim_console) {

                if ((fd == 1 || fd == 2) && rq == SELECT_ONE_WRITE) {

                    regs[2] = 1;

                } else {

                    regs[2] = 0;

                }

                regs[3] = 0;

            } else {

                fd_set fdset;



                FD_ZERO(&fdset);

                FD_SET(fd, &fdset);

                regs[2] = select(fd + 1,

                                 rq == SELECT_ONE_READ   ? &fdset : NULL,

                                 rq == SELECT_ONE_WRITE  ? &fdset : NULL,
@@ -259,6 +311,7 @@ void HELPER(simcall)(CPUXtensaState *env) 
                                 target_tv ? &tv : NULL);

                regs[3] = errno_h2g(errno);

            }

        }

        break;



    case TARGET_SYS_argc: