Commit f7c61bf8 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'for-upstream' of git://github.com/mwalle/qemu 

* 'for-upstream' of git://github.com/mwalle/qemu:
  configure: rename OpenGL feature to GLX
  configure: proper OpenGL/GLX probe
  target-lm32: use HELPER() macro
  target-lm32: flush tlb after clearing env
  target-lm32: remove dead code
  target-lm32: fix cmpgui and cmpgeui opcodes
  tests: tcg: lm32: add more test cases
  target-lm32: don't log cpu state in translation
  lm32_uart: fix receive buffering
  milkymist-uart: fix receive buffering
  lm32-dis: fix NULL pointer dereference
  target-lm32: fix debug memory access
parents d76bb735 b1e5fff4

configure

+17 −17
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ spice="" 
rbd=""

smartcard_nss=""

usb_redir=""

opengl=""

glx=""

zlib="yes"

guest_agent="yes"

want_tools="yes"
@@ -858,9 +858,9 @@ for opt do 
  ;;

  --enable-vhost-net) vhost_net="yes"

  ;;

  --disable-opengl) opengl="no"

  --disable-glx) glx="no"

  ;;

  --enable-opengl) opengl="yes"

  --enable-glx) glx="yes"

  ;;

  --disable-rbd) rbd="no"

  ;;
@@ -2436,23 +2436,23 @@ EOF 
fi



##########################################

# opengl probe, used by milkymist-tmu2

if test "$opengl" != "no" ; then

  opengl_libs="-lGL -lX11"

# GLX probe, used by milkymist-tmu2

if test "$glx" != "no" ; then

  glx_libs="-lGL -lX11"

  cat > $TMPC << EOF

#include <X11/Xlib.h>

#include <GL/gl.h>

#include <GL/glx.h>

int main(void) { return GL_VERSION != 0; }

int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; }

EOF

  if compile_prog "" "-lGL" ; then

    opengl=yes

  if compile_prog "" "-lGL -lX11" ; then

    glx=yes

  else

    if test "$opengl" = "yes" ; then

      feature_not_found "opengl"

    if test "$glx" = "yes" ; then

      feature_not_found "glx"

    fi

    opengl_libs=

    opengl=no

    glx_libs=

    glx=no

  fi

fi
@@ -3430,7 +3430,7 @@ echo "rbd support $rbd" 
echo "xfsctl support    $xfs"

echo "nss used          $smartcard_nss"

echo "usb net redir     $usb_redir"

echo "OpenGL support    $opengl"

echo "GLX support       $glx"

echo "libiscsi support  $libiscsi"

echo "build guest agent $guest_agent"

echo "seccomp support   $seccomp"
@@ -3741,8 +3741,8 @@ if test "$usb_redir" = "yes" ; then 
  echo "CONFIG_USB_REDIR=y" >> $config_host_mak

fi



if test "$opengl" = "yes" ; then

  echo "CONFIG_OPENGL=y" >> $config_host_mak

if test "$glx" = "yes" ; then

  echo "CONFIG_GLX=y" >> $config_host_mak

fi



if test "$libiscsi" = "yes" ; then
@@ -4020,7 +4020,7 @@ case "$target_arch2" in 
    target_nptl="yes"

  ;;

  lm32)

    target_libs_softmmu="$opengl_libs"

    target_libs_softmmu="$glx_libs"

  ;;

  m68k)

    bflt="yes"

disas/lm32.c

+4 −4
Original line number Diff line number Diff line
@@ -303,11 +303,11 @@ int print_insn_lm32(bfd_vma memaddr, struct disassemble_info *info) 
                }

                case 'c': {

                    uint8_t csr;

                    const char *csr_name;

                    const Lm32CsrInfo *info;

                    csr = (op >> 21) & 0x1f;

                    csr_name = find_csr_info(csr)->name;

                    if (csr_name) {

                        fprintf_fn(stream, "%s", csr_name);

                    info = find_csr_info(csr);

                    if (info) {

                        fprintf_fn(stream, "%s", info->name);

                    } else {

                        fprintf_fn(stream, "0x%x", csr);

                    }

hw/lm32/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-y += milkymist-minimac2.o 
obj-y += milkymist-pfpu.o

obj-y += milkymist-softusb.o

obj-y += milkymist-sysctl.o

obj-$(CONFIG_OPENGL) += milkymist-tmu2.o

obj-$(CONFIG_GLX) += milkymist-tmu2.o

obj-y += milkymist-uart.o

obj-y += milkymist-vgafb.o

obj-y += framebuffer.o

hw/lm32_uart.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static uint64_t uart_read(void *opaque, hwaddr addr, 
        r = s->regs[R_RXTX];

        s->regs[R_LSR] &= ~LSR_DR;

        uart_update_irq(s);

        qemu_chr_accept_input(s->chr);

        break;

    case R_IIR:

    case R_LSR:

hw/milkymist-hw.h

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, 
    return dev;

}



#ifdef CONFIG_OPENGL

#ifdef CONFIG_GLX

#include <X11/Xlib.h>

#include <GL/glx.h>

static const int glx_fbconfig_attr[] = {
@@ -101,7 +101,7 @@ static const int glx_fbconfig_attr[] = { 
static inline DeviceState *milkymist_tmu2_create(hwaddr base,

        qemu_irq irq)

{

#ifdef CONFIG_OPENGL

#ifdef CONFIG_GLX

    DeviceState *dev;

    Display *d;

    GLXFBConfig *configs;