Commit 82de978a authored by Peter Maydell's avatar Peter Maydell
Browse files

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



target/xtensa updates:

- make mini-bootloader independent of the initial CPU state;
- add noMMU XTFPGA variants;
- add two noMMU cores: de212 and sample_controller;
- fix issues reported by coverity against xtensa translator and disassembler.

# gpg: Signature made Mon 22 Jan 2018 20:00:01 GMT
# 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/20180122-xtensa:
  target/xtensa: disas/xtensa: fix coverity warnings
  target/xtensa: add sample_controller core
  target/xtensa: allow different default CPU for MMU/noMMU
  target/xtensa: add de212 core
  hw/xtensa/xtfpga: support noMMU cores
  hw/xtensa/xtfpga: extract flash configuration
  hw/xtensa: extract xtensa_create_memory_regions
  target/xtensa: fix default sysrom/sysram addresses
  hw/xtensa/xtfpga: clean up function/structure names
  hw/xtensa/xtfpga: rewrite mini bootloader

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 25bfd5a7 847a6473

disas/xtensa.c

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ int print_insn_xtensa(bfd_vma memaddr, struct disassemble_info *info) 
    bfd_byte *buffer = g_malloc(1);

    int status = info->read_memory_func(memaddr, buffer, 1, info);

    xtensa_format fmt;

    unsigned slot, slots;

    int slot, slots;

    unsigned len;



    if (status) {
@@ -79,7 +79,7 @@ int print_insn_xtensa(bfd_vma memaddr, struct disassemble_info *info) 


    for (slot = 0; slot < slots; ++slot) {

        xtensa_opcode opc;

        unsigned opnd, vopnd, opnds;

        int opnd, vopnd, opnds;



        if (slot) {

            info->fprintf_func(info->stream, "; ");

hw/xtensa/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
obj-y += pic_cpu.o

obj-y += sim.o

obj-y += xtensa_memory.o

obj-y += xtfpga.o

hw/xtensa/sim.c

+13 −25
Original line number Diff line number Diff line
@@ -36,25 +36,7 @@ 
#include "exec/memory.h"

#include "exec/address-spaces.h"

#include "qemu/error-report.h"



static void xtensa_create_memory_regions(const XtensaMemory *memory,

                                         const char *name)

{

    unsigned i;

    GString *num_name = g_string_new(NULL);



    for (i = 0; i < memory->num; ++i) {

        MemoryRegion *m;



        g_string_printf(num_name, "%s%u", name, i);

        m = g_new(MemoryRegion, 1);

        memory_region_init_ram(m, NULL, num_name->str,

                               memory->location[i].size, &error_fatal);

        memory_region_add_subregion(get_system_memory(),

                                    memory->location[i].addr, m);

    }

    g_string_free(num_name, true);

}

#include "xtensa_memory.h"



static uint64_t translate_phys_addr(void *opaque, uint64_t addr)

{
@@ -94,12 +76,18 @@ static void xtensa_sim_init(MachineState *machine) 
        XtensaMemory sysram = env->config->sysram;



        sysram.location[0].size = ram_size;

        xtensa_create_memory_regions(&env->config->instrom, "xtensa.instrom");

        xtensa_create_memory_regions(&env->config->instram, "xtensa.instram");

        xtensa_create_memory_regions(&env->config->datarom, "xtensa.datarom");

        xtensa_create_memory_regions(&env->config->dataram, "xtensa.dataram");

        xtensa_create_memory_regions(&env->config->sysrom, "xtensa.sysrom");

        xtensa_create_memory_regions(&sysram, "xtensa.sysram");

        xtensa_create_memory_regions(&env->config->instrom, "xtensa.instrom",

                                     get_system_memory());

        xtensa_create_memory_regions(&env->config->instram, "xtensa.instram",

                                     get_system_memory());

        xtensa_create_memory_regions(&env->config->datarom, "xtensa.datarom",

                                     get_system_memory());

        xtensa_create_memory_regions(&env->config->dataram, "xtensa.dataram",

                                     get_system_memory());

        xtensa_create_memory_regions(&env->config->sysrom, "xtensa.sysrom",

                                     get_system_memory());

        xtensa_create_memory_regions(&sysram, "xtensa.sysram",

                                     get_system_memory());

    }



    if (serial_hds[0]) {

hw/xtensa/xtensa_memory.c

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, Max Filippov, Open Source and Linux Lab.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of the Open Source and Linux Lab nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include "qemu/osdep.h"

#include "qapi/error.h"

#include "qemu-common.h"

#include "cpu.h"

#include "sysemu/sysemu.h"

#include "hw/boards.h"

#include "exec/memory.h"

#include "qemu/error-report.h"

#include "xtensa_memory.h"



void xtensa_create_memory_regions(const XtensaMemory *memory,

                                  const char *name,

                                  MemoryRegion *super)

{

    unsigned i;

    GString *num_name = g_string_new(NULL);



    for (i = 0; i < memory->num; ++i) {

        MemoryRegion *m;



        g_string_printf(num_name, "%s%u", name, i);

        m = g_new(MemoryRegion, 1);

        memory_region_init_ram(m, NULL, num_name->str,

                               memory->location[i].size, &error_fatal);

        memory_region_add_subregion(super, memory->location[i].addr, m);

    }

    g_string_free(num_name, true);

}

hw/xtensa/xtensa_memory.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, Max Filippov, Open Source and Linux Lab.

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions are met:

 *     * Redistributions of source code must retain the above copyright

 *       notice, this list of conditions and the following disclaimer.

 *     * Redistributions in binary form must reproduce the above copyright

 *       notice, this list of conditions and the following disclaimer in the

 *       documentation and/or other materials provided with the distribution.

 *     * Neither the name of the Open Source and Linux Lab nor the

 *       names of its contributors may be used to endorse or promote products

 *       derived from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#ifndef _XTENSA_MEMORY_H

#define _XTENSA_MEMORY_H



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "cpu.h"

#include "exec/memory.h"



void xtensa_create_memory_regions(const XtensaMemory *memory,

                                  const char *name,

                                  MemoryRegion *super);



#endif