Commit 1f6b12f7 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/mwalle/tags/lm32-fixes/20140204' into staging 



target-lm32: fixes

# gpg: Signature made Tue 04 Feb 2014 18:47:56 GMT using DSA key ID 3F98A378
# gpg: Can't check signature: public key not found

* remotes/mwalle/tags/lm32-fixes/20140204:
  hw/lm32: print error if cpu model is not found
  target-lm32: stop VM on illegal or unknown instruction
  lm32_sys: dump cpu state if test case fails
  lm32_sys: print test result on stderr
  target-lm32: add breakpoint/watchpoint support
  target-lm32: move model features to LM32CPU
  target-lm32: kill cpu_abort() calls
  milkymist-vgafb: swap pixel data in source buffer
  lm32_uart/lm32_juart: use qemu_chr_fe_write_all()
  milkymist-uart: use qemu_chr_fe_write_all() instead of qemu_chr_fe_write()
  tests: lm32: new rule for single test cases
  lm32_sys: increase test case name length limit

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 3ea3bd62 f41152bd

hw/char/lm32_juart.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ void lm32_juart_set_jtx(DeviceState *d, uint32_t jtx) 


    s->jtx = jtx;

    if (s->chr) {

        qemu_chr_fe_write(s->chr, &ch, 1);

        qemu_chr_fe_write_all(s->chr, &ch, 1);

    }

}

hw/char/lm32_uart.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void uart_write(void *opaque, hwaddr addr, 
    switch (addr) {

    case R_RXTX:

        if (s->chr) {

            qemu_chr_fe_write(s->chr, &ch, 1);

            qemu_chr_fe_write_all(s->chr, &ch, 1);

        }

        break;

    case R_IER:

hw/char/milkymist-uart.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static void uart_write(void *opaque, hwaddr addr, uint64_t value, 
    switch (addr) {

    case R_RXTX:

        if (s->chr) {

            qemu_chr_fe_write(s->chr, &ch, 1);

            qemu_chr_fe_write_all(s->chr, &ch, 1);

        }

        s->regs[R_STAT] |= STAT_TX_EVT;

        break;

hw/display/milkymist-vgafb_template.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ static void glue(draw_line_, BITS)(void *opaque, uint8_t *d, const uint8_t *s, 
    uint8_t r, g, b;



    while (width--) {

        memcpy(&rgb565, s, sizeof(rgb565));

        rgb565 = lduw_be_p(s);

        r = ((rgb565 >> 11) & 0x1f) << 3;

        g = ((rgb565 >>  5) & 0x3f) << 2;

        b = ((rgb565 >>  0) & 0x1f) << 3;

hw/lm32/lm32_boards.c

+10 −0
Original line number Diff line number Diff line
@@ -101,6 +101,11 @@ static void lm32_evr_init(QEMUMachineInitArgs *args) 
        cpu_model = "lm32-full";

    }

    cpu = cpu_lm32_init(cpu_model);

    if (cpu == NULL) {

        fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);

        exit(1);

    }



    env = &cpu->env;

    reset_info->cpu = cpu;
@@ -198,6 +203,11 @@ static void lm32_uclinux_init(QEMUMachineInitArgs *args) 
        cpu_model = "lm32-full";

    }

    cpu = cpu_lm32_init(cpu_model);

    if (cpu == NULL) {

        fprintf(stderr, "qemu: unable to find CPU '%s'\n", cpu_model);

        exit(1);

    }



    env = &cpu->env;

    reset_info->cpu = cpu;