Commit 34a44504 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20150824' into staging 



queued tcg patches

# gpg: Signature made Mon 24 Aug 2015 19:37:15 BST using RSA key ID 4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg:                 aka "Richard Henderson <rth@redhat.com>"
# gpg:                 aka "Richard Henderson <rth@twiddle.net>"

* remotes/rth/tags/pull-tcg-20150824:
  linux-user: remove useless macros GUEST_BASE and RESERVED_VA
  linux-user: remove --enable-guest-base/--disable-guest-base
  tcg/aarch64: Use softmmu fast path for unaligned accesses
  tcg/s390: Use softmmu fast path for unaligned accesses
  tcg/ppc: Improve unaligned load/store handling on 64-bit backend
  tcg/i386: use softmmu fast path for unaligned accesses
  tcg: Remove tcg_gen_trunc_i64_i32
  tcg: Split trunc_shr_i32 opcode into extr[lh]_i64_i32
  tcg: update README about size changing ops
  tcg/optimize: add optimizations for ext_i32_i64 and extu_i32_i64 ops
  tcg: implement real ext_i32_i64 and extu_i32_i64 ops
  tcg: don't abuse TCG type in tcg_gen_trunc_shr_i64_i32
  tcg: rename trunc_shr_i32 into trunc_shr_i64_i32
  tcg/optimize: allow constant to have copies
  tcg/optimize: track const/copy status separately
  tcg/optimize: add temp_is_const and temp_is_copy functions
  tcg/optimize: optimize temps tracking
  tcg/optimize: fix constant signedness

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

bsd-user/elfload.c

+0 −2
Original line number Diff line number Diff line
@@ -1371,7 +1371,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, 
    info->mmap = 0;

    elf_entry = (abi_ulong) elf_ex.e_entry;



#if defined(CONFIG_USE_GUEST_BASE)

    /*

     * In case where user has not explicitly set the guest_base, we

     * probe here that should we set it automatically.
@@ -1392,7 +1391,6 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, 
            }

        }

    }

#endif /* CONFIG_USE_GUEST_BASE */



    /* Do this so that we can load the interpreter, if need be.  We will

       change some of these later */

bsd-user/main.c

+0 −12
Original line number Diff line number Diff line
@@ -35,12 +35,10 @@ 
#include "qemu/envlist.h"



int singlestep;

#if defined(CONFIG_USE_GUEST_BASE)

unsigned long mmap_min_addr;

unsigned long guest_base;

int have_guest_base;

unsigned long reserved_va;

#endif



static const char *interp_prefix = CONFIG_QEMU_INTERP_PREFIX;

const char *qemu_uname_release;
@@ -682,9 +680,7 @@ static void usage(void) 
           "-drop-ld-preload  drop LD_PRELOAD for target process\n"

           "-E var=value      sets/modifies targets environment variable(s)\n"

           "-U var            unsets targets environment variable(s)\n"

#if defined(CONFIG_USE_GUEST_BASE)

           "-B address        set guest_base address to address\n"

#endif

           "-bsd type         select emulated BSD type FreeBSD/NetBSD/OpenBSD (default)\n"

           "\n"

           "Debug options:\n"
@@ -830,11 +826,9 @@ int main(int argc, char **argv) 
#endif

                exit(1);

            }

#if defined(CONFIG_USE_GUEST_BASE)

        } else if (!strcmp(r, "B")) {

           guest_base = strtol(argv[optind++], NULL, 0);

           have_guest_base = 1;

#endif

        } else if (!strcmp(r, "drop-ld-preload")) {

            (void) envlist_unsetenv(envlist, "LD_PRELOAD");

        } else if (!strcmp(r, "bsd")) {
@@ -923,7 +917,6 @@ int main(int argc, char **argv) 
    target_environ = envlist_to_environ(envlist, NULL);

    envlist_free(envlist);



#if defined(CONFIG_USE_GUEST_BASE)

    /*

     * Now that page sizes are configured in cpu_init() we can do

     * proper page alignment for guest_base.
@@ -950,7 +943,6 @@ int main(int argc, char **argv) 
            fclose(fp);

        }

    }

#endif /* CONFIG_USE_GUEST_BASE */



    if (loader_exec(filename, argv+optind, target_environ, regs, info) != 0) {

        printf("Error loading %s\n", filename);
@@ -964,9 +956,7 @@ int main(int argc, char **argv) 
    free(target_environ);



    if (qemu_log_enabled()) {

#if defined(CONFIG_USE_GUEST_BASE)

        qemu_log("guest_base  0x%lx\n", guest_base);

#endif

        log_page_dump();



        qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
@@ -986,12 +976,10 @@ int main(int argc, char **argv) 
    syscall_init();

    signal_init();



#if defined(CONFIG_USE_GUEST_BASE)

    /* Now that we've loaded the binary, GUEST_BASE is fixed.  Delay

       generating the prologue until now so that the prologue can take

       the real value of GUEST_BASE into account.  */

    tcg_prologue_init(&tcg_ctx);

#endif



    /* build Task State */

    memset(ts, 0, sizeof(TaskState));

bsd-user/qemu.h

+0 −2
Original line number Diff line number Diff line
@@ -101,9 +101,7 @@ typedef struct TaskState { 


void init_task_state(TaskState *ts);

extern const char *qemu_uname_release;

#if defined(CONFIG_USE_GUEST_BASE)

extern unsigned long mmap_min_addr;

#endif



/* ??? See if we can avoid exposing so much of the loader internals.  */

/*

configure

+0 −10
Original line number Diff line number Diff line
@@ -293,7 +293,6 @@ cocoa="no" 
softmmu="yes"

linux_user="no"

bsd_user="no"

guest_base="yes"

aix="no"

blobs="yes"

pkgversion=""
@@ -975,10 +974,6 @@ for opt do 
  ;;

  --enable-bsd-user) bsd_user="yes"

  ;;

  --enable-guest-base) guest_base="yes"

  ;;

  --disable-guest-base) guest_base="no"

  ;;

  --enable-pie) pie="yes"

  ;;

  --disable-pie) pie="no"
@@ -1314,7 +1309,6 @@ disabled with --disable-FEATURE, default is enabled if available: 
  user            supported user emulation targets

  linux-user      all linux usermode emulation targets

  bsd-user        all BSD usermode emulation targets

  guest-base      GUEST_BASE support for usermode emulation targets

  docs            build documentation

  guest-agent     build the QEMU Guest Agent

  guest-agent-msi build guest agent Windows MSI installation package
@@ -4544,7 +4538,6 @@ fi 
echo "brlapi support    $brlapi"

echo "bluez  support    $bluez"

echo "Documentation     $docs"

echo "GUEST_BASE        $guest_base"

echo "PIE               $pie"

echo "vde support       $vde"

echo "netmap support    $netmap"
@@ -5481,9 +5474,6 @@ fi 
if test "$target_user_only" = "yes" -a "$bflt" = "yes"; then

  echo "TARGET_HAS_BFLT=y" >> $config_target_mak

fi

if test "$target_user_only" = "yes" -a "$guest_base" = "yes"; then

  echo "CONFIG_USE_GUEST_BASE=y" >> $config_target_mak

fi

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

  echo "CONFIG_BSD_USER=y" >> $config_target_mak

fi

include/exec/cpu-all.h

+1 −8
Original line number Diff line number Diff line
@@ -160,18 +160,11 @@ static inline void tswap64s(uint64_t *s) 
/* On some host systems the guest address space is reserved on the host.

 * This allows the guest address space to be offset to a convenient location.

 */

#if defined(CONFIG_USE_GUEST_BASE)

extern unsigned long guest_base;

extern int have_guest_base;

extern unsigned long reserved_va;

#define GUEST_BASE guest_base

#define RESERVED_VA reserved_va

#else

#define GUEST_BASE 0ul

#define RESERVED_VA 0ul

#endif



#define GUEST_ADDR_MAX (RESERVED_VA ? RESERVED_VA : \

#define GUEST_ADDR_MAX (reserved_va ? reserved_va : \

                                    (1ul << TARGET_VIRT_ADDR_SPACE_BITS) - 1)

#endif