Commit 7ba48975 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/rth/tcg-ppc-merge-1' into staging 



* remotes/rth/tcg-ppc-merge-1: (25 commits)
  tcg-ppc: Use the return address as a base pointer
  tcg-ppc: Merge cache-utils into the backend
  qemu/osdep: Remove the need for qemu_init_auxval
  tcg-ppc: Rename the tcg/ppc64 backend
  tcg-ppc: Remove the backend
  tcg-ppc64: Merge ppc32 shifts
  tcg-ppc64: Support mulsh_i32
  tcg-ppc64: Merge ppc32 register usage
  tcg-ppc64: Merge ppc32 qemu_ld/st
  tcg-ppc64: Merge ppc32 brcond2, setcond2, muluh
  tcg-ppc64: Begin merging ppc32 with ppc64
  tcg-ppc64: Fix sub2 implementation
  tcg-ppc64: Merge 32-bit ABIs into the prologue / frame code
  tcg-ppc64: Adjust tcg_out_call for ELFv2
  tcg-ppc64: Support the ppc64 elfv2 ABI
  tcg-ppc64: Use the correct test in tcg_out_call
  tcg-ppc64: Better parameterize the stack frame
  tcg-ppc64: Fix TCG_TARGET_CALL_STACK_OFFSET
  tcg-ppc64: Move call macros out of tcg-target.h
  tcg-ppc64: Make TCG_AREG0 and TCG_REG_CALL_STACK enum constants
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 9f862687 a84ac4cb

configure

+2 −0
Original line number Diff line number Diff line
@@ -4747,6 +4747,8 @@ elif test "$ARCH" = "s390x" ; then 
  QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/s390 $QEMU_INCLUDES"

elif test "$ARCH" = "x86_64" -o "$ARCH" = "x32" ; then

  QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/i386 $QEMU_INCLUDES"

elif test "$ARCH" = "ppc64" ; then

  QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/ppc $QEMU_INCLUDES"

else

  QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"

fi

exec.c

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 


#include "exec/memory-internal.h"

#include "exec/ram_addr.h"

#include "qemu/cache-utils.h"



#include "qemu/range.h"

include/exec/exec-all.h

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr) 
    /* no need to flush icache explicitly */

}

#elif defined(_ARCH_PPC)

void ppc_tb_set_jmp_target(unsigned long jmp_addr, unsigned long addr);

void ppc_tb_set_jmp_target(uintptr_t jmp_addr, uintptr_t addr);

#define tb_set_jmp_target1 ppc_tb_set_jmp_target

#elif defined(__i386__) || defined(__x86_64__)

static inline void tb_set_jmp_target1(uintptr_t jmp_addr, uintptr_t addr)

include/qemu/cache-utils.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
#ifndef QEMU_CACHE_UTILS_H

#define QEMU_CACHE_UTILS_H



#if defined(_ARCH_PPC)



#include <stdint.h> /* uintptr_t */



struct qemu_cache_conf {

    unsigned long dcache_bsize;

    unsigned long icache_bsize;

};



extern struct qemu_cache_conf qemu_cache_conf;



void qemu_cache_utils_init(void);



/* mildly adjusted code from tcg-dyngen.c */

static inline void flush_icache_range(uintptr_t start, uintptr_t stop)

{

    unsigned long p, start1, stop1;

    unsigned long dsize = qemu_cache_conf.dcache_bsize;

    unsigned long isize = qemu_cache_conf.icache_bsize;



    start1 = start & ~(dsize - 1);

    stop1 = (stop + dsize - 1) & ~(dsize - 1);

    for (p = start1; p < stop1; p += dsize) {

        asm volatile ("dcbst 0,%0" : : "r"(p) : "memory");

    }

    asm volatile ("sync" : : : "memory");



    start &= start & ~(isize - 1);

    stop1 = (stop + isize - 1) & ~(isize - 1);

    for (p = start1; p < stop1; p += isize) {

        asm volatile ("icbi 0,%0" : : "r"(p) : "memory");

    }

    asm volatile ("sync" : : : "memory");

    asm volatile ("isync" : : : "memory");

}



#else

#define qemu_cache_utils_init() do { } while (0)

#endif



#endif /* QEMU_CACHE_UTILS_H */

include/qemu/osdep.h

+0 −12
Original line number Diff line number Diff line
@@ -251,18 +251,6 @@ unsigned long qemu_getauxval(unsigned long type); 
static inline unsigned long qemu_getauxval(unsigned long type) { return 0; }

#endif



/**

 * qemu_init_auxval:

 * @envp: the third argument to main

 *

 * If supported and required, locate the auxiliary vector at program startup.

 */

#if defined(CONFIG_GETAUXVAL) || !defined(__linux__)

static inline void qemu_init_auxval(char **envp) { }

#else

void qemu_init_auxval(char **envp);

#endif



void qemu_set_tty_echo(int fd, bool echo);



void os_mem_prealloc(int fd, char *area, size_t sz);