diff options
| -rwxr-xr-x | check_ops.sh | 3 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | dyngen-exec.h | 15 | ||||
| -rw-r--r-- | dyngen.c | 17 | ||||
| -rw-r--r-- | exec-all.h | 18 |
5 files changed, 32 insertions, 24 deletions
diff --git a/check_ops.sh b/check_ops.sh index b1f2f8500c..1c9cf87e36 100755 --- a/check_ops.sh +++ b/check_ops.sh @@ -35,6 +35,9 @@ case $machine in mips*) ret='\tjr.*ra' ;; + s390*) + ret='\tbr.*' + ;; *) echo "Unknown machine `uname -m`" ;; @@ -356,6 +356,9 @@ case $cpu in ARCH_LDFLAGS="${SP_LDFLAGS}" fi ;; + s390) + ARCH_CFLAGS="-march=z900" + ;; esac if [ "$solaris" = "yes" -a "$cpu" = "x86_64" ] ; then diff --git a/dyngen-exec.h b/dyngen-exec.h index 37c593e291..6f69beedc1 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -38,7 +38,7 @@ typedef unsigned int uint32_t; // Linux/Sparc64 defines uint64_t #if !(defined (__sparc_v9__) && defined(__linux__)) /* XXX may be done for all 64 bits targets ? */ -#if defined (__x86_64__) || defined(__ia64) +#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) typedef unsigned long uint64_t; #else typedef unsigned long long uint64_t; @@ -55,7 +55,7 @@ typedef signed short int16_t; typedef signed int int32_t; // Linux/Sparc64 defines int64_t #if !(defined (__sparc_v9__) && defined(__linux__)) -#if defined (__x86_64__) || defined(__ia64) +#if defined (__x86_64__) || defined(__ia64) || defined(__s390x__) typedef signed long int64_t; #else typedef signed long long int64_t; @@ -205,7 +205,7 @@ extern int printf(const char *, ...); #define stringify(s) tostring(s) #define tostring(s) #s -#ifdef __alpha__ +#if defined(__alpha__) || defined(__s390__) /* the symbols are considered non exported so a br immediate is generated */ #define __hidden __attribute__((visibility("hidden"))) #else @@ -224,6 +224,13 @@ extern int __op_param3 __hidden; #define PARAM1 ({ int _r; asm("" : "=r"(_r) : "0" (&__op_param1)); _r; }) #define PARAM2 ({ int _r; asm("" : "=r"(_r) : "0" (&__op_param2)); _r; }) #define PARAM3 ({ int _r; asm("" : "=r"(_r) : "0" (&__op_param3)); _r; }) +#elif defined(__s390__) +extern int __op_param1 __hidden; +extern int __op_param2 __hidden; +extern int __op_param3 __hidden; +#define PARAM1 ({ int _r; asm("bras %0,8; .long " ASM_NAME(__op_param1) "; l %0,0(%0)" : "=r"(_r) : ); _r; }) +#define PARAM2 ({ int _r; asm("bras %0,8; .long " ASM_NAME(__op_param2) "; l %0,0(%0)" : "=r"(_r) : ); _r; }) +#define PARAM3 ({ int _r; asm("bras %0,8; .long " ASM_NAME(__op_param3) "; l %0,0(%0)" : "=r"(_r) : ); _r; }) #else #if defined(__APPLE__) static int __op_param1, __op_param2, __op_param3; @@ -254,7 +261,7 @@ extern int __op_jmp0, __op_jmp1, __op_jmp2, __op_jmp3; #define GOTO_LABEL_PARAM(n) asm volatile ("b " ASM_NAME(__op_gen_label) #n) #elif defined(__s390__) #define EXIT_TB() asm volatile ("br %r14") -#define GOTO_LABEL_PARAM(n) asm volatile ("bras %r7,8; .long " ASM_NAME(__op_gen_label) #n "; l %r7, 0(%r7); br %r7") +#define GOTO_LABEL_PARAM(n) asm volatile ("larl %r7,12; l %r7,0(%r7); br %r7; .long " ASM_NAME(__op_gen_label) #n) #elif defined(__alpha__) #define EXIT_TB() asm volatile ("ret") #elif defined(__ia64__) @@ -1495,8 +1495,8 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, p = (void *)(p_end - 2); if (p == p_start) error("empty code for %s", name); - if (get16((uint16_t *)p) != 0x07fe && get16((uint16_t *)p) != 0x07f4) - error("br %%r14 expected at the end of %s", name); + if ((get16((uint16_t *)p) & 0xfff0) != 0x07f0) + error("br expected at the end of %s", name); copy_size = p - p_start; } #elif defined(HOST_ALPHA) @@ -2120,6 +2120,19 @@ void gen_code(const char *name, host_ulong offset, host_ulong size, fprintf(outfile, " *(uint8_t *)(gen_code_ptr + %d) = %s + %d;\n", reloc_offset, relname, addend); break; + case R_390_PC32DBL: + if (ELF32_ST_TYPE(symtab[ELFW(R_SYM)(rel->r_info)].st_info) == STT_SECTION) { + fprintf(outfile, + " *(uint32_t *)(gen_code_ptr + %d) += " + "((long)&%s - (long)gen_code_ptr) >> 1;\n", + reloc_offset, name); + } + else + fprintf(outfile, + " *(uint32_t *)(gen_code_ptr + %d) = " + "(%s + %d - ((uint32_t)gen_code_ptr + %d)) >> 1;\n", + reloc_offset, relname, addend, reloc_offset); + break; default: error("unsupported s390 relocation (%d)", type); } diff --git a/exec-all.h b/exec-all.h index 0ced25ca13..4b4f265ef8 100644 --- a/exec-all.h +++ b/exec-all.h @@ -350,24 +350,6 @@ do {\ "1:\n");\ } while (0) -#elif defined(__s390__) -/* GCC spills R13, so we have to restore it before branching away */ - -#define GOTO_TB(opname, tbparam, n)\ -do {\ - static void __attribute__((used)) *dummy ## n = &&dummy_label ## n;\ - static void __attribute__((used)) *__op_label ## n \ - __asm__(ASM_OP_LABEL_NAME(n, opname)) = &&label ## n;\ - __asm__ __volatile__ ( \ - "l %%r13,52(%%r15)\n" \ - "br %0\n" \ - : : "r" (((TranslationBlock*)tbparam)->tb_next[n]));\ - \ - for(;*((int*)0);); /* just to keep GCC busy */ \ -label ## n: ;\ -dummy_label ## n: ;\ -} while(0) - #else /* jump to next block operations (more portable code, does not need |