Commit 5a30d3f1 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 'upstream' of git://qemu.weilnetz.de/qemu 

* 'upstream' of git://qemu.weilnetz.de/qemu:
  Move definition of HOST_LONG_BITS to qemu-common.h
  target-xtensa: Clean includes
  target-unicore32: Clean includes
  target-sh4: Clean includes
  target-s390x: Clean includes
  target-ppc: Clean includes
  target-mips: Clean includes
  target-microblaze: Clean includes
  target-m68k: Clean includes
  target-lm32: Clean includes
  target-i386: Clean includes
  target-cris: Clean includes
  target-arm: Clean includes
  target-alpha: Clean includes
  Remove macro HOST_LONG_SIZE
parents 41e37c33 c0fd260e

configure

+0 −12
Original line number Diff line number Diff line
@@ -1291,17 +1291,6 @@ esac 


fi



# host long bits test, actually a pointer size test

cat > $TMPC << EOF

int sizeof_pointer_is_8[sizeof(void *) == 8 ? 1 : -1];

EOF

if compile_object; then

hostlongbits=64

else

hostlongbits=32

fi





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

# NPTL probe
@@ -2988,7 +2977,6 @@ fi 
if test "$bigendian" = "yes" ; then

  echo "HOST_WORDS_BIGENDIAN=y" >> $config_host_mak

fi

echo "HOST_LONG_BITS=$hostlongbits" >> $config_host_mak

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

  echo "CONFIG_WIN32=y" >> $config_host_mak

  rc_version=`cat $source_path/VERSION`

cpu-defs.h

+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ typedef uint64_t target_ulong __attribute__((aligned(TARGET_LONG_ALIGNMENT))); 
#error TARGET_LONG_SIZE undefined

#endif



#define HOST_LONG_SIZE (HOST_LONG_BITS / 8)



#define EXCP_INTERRUPT 	0x10000 /* async interruption */

#define EXCP_HLT        0x10001 /* hlt instruction reached */

#define EXCP_DEBUG      0x10002 /* cpu stopped after a breakpoint or singlestep */

qemu-common.h

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,15 @@ typedef struct Monitor Monitor; 
#define TIME_MAX LONG_MAX

#endif



/* HOST_LONG_BITS is the size of a native pointer in bits. */

#if UINTPTR_MAX == UINT32_MAX

# define HOST_LONG_BITS 32

#elif UINTPTR_MAX == UINT64_MAX

# define HOST_LONG_BITS 64

#else

# error Unknown pointer size

#endif



#ifndef CONFIG_IOVEC

#define CONFIG_IOVEC

struct iovec {

target-alpha/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#define __CPU_ALPHA_H__



#include "config.h"

#include "qemu-common.h"



#define TARGET_LONG_BITS 64

target-alpha/translate.c

+0 −5
Original line number Diff line number Diff line
@@ -17,15 +17,10 @@ 
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#include <stdint.h>

#include <stdlib.h>

#include <stdio.h>



#include "cpu.h"

#include "disas.h"

#include "host-utils.h"

#include "tcg-op.h"

#include "qemu-common.h"



#include "helper.h"

#define GEN_HELPER 1