Alpha update (Falk Hueffner)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@203 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/dyngen.c b/dyngen.c
index bfc1540c3afc51dd3a36381045e0ddf462c5fe5b..225d2bab866bd41609455ba218ade34eeffcdf0c 100644 (file)
--- a/dyngen.c
+++ b/dyngen.c
@@ -691,7 +691,7 @@ void gen_code(const char *name, host_ulong offset, host_ulong size,
                        case R_ALPHA_BRSGP:
                            /* PC-relative jump. Tweak offset to skip the two instructions that try to
                               set up the gp from the pv.  */
-                           fprintf(outfile, "    fix_bsr(gen_code_ptr + %ld, (uint8_t *) &%s - (gen_code_ptr + %ld) + 4);\n",
+                           fprintf(outfile, "    fix_bsr(gen_code_ptr + %ld, (uint8_t *) &%s - (gen_code_ptr + %ld + 4) + 8);\n",
                                    rel->r_offset - start_offset, sym_name, rel->r_offset - start_offset);
                            break;
                        default:

diff --git a/exec-i386.c b/exec-i386.c
index 2114d656d25e8059960f1d5cf82c4d8e5cc48756..5bd69d4a522fdf89188bdfb1ae0f991d7c7927d2 100644 (file)
--- a/exec-i386.c
+++ b/exec-i386.c
@@ -447,6 +447,34 @@ int cpu_x86_signal_handler(int host_signum, struct siginfo *info,
                              is_write, &uc->uc_sigmask);
 }
 
+#elif defined(__alpha__)
+
+int cpu_x86_signal_handler(int host_signum, struct siginfo *info, 
+                           void *puc)
+{
+    struct ucontext *uc = puc;
+    uint32_t *pc = uc->uc_mcontext.sc_pc;
+    uint32_t insn = *pc;
+    int is_write = 0;
+
+    switch (insn >> 26) {
+    case 0x0d: // stw
+    case 0x0e: // stb
+    case 0x0f: // stq_u
+    case 0x24: // stf
+    case 0x25: // stg
+    case 0x26: // sts
+    case 0x27: // stt
+    case 0x2c: // stl
+    case 0x2d: // stq
+    case 0x2e: // stl_c
+    case 0x2f: // stq_c
+       is_write = 1;
+    }
+
+    return handle_cpu_signal(pc, (unsigned long)info->si_addr, 
+                             is_write, &uc->uc_sigmask);
+}
 #else
 
 #error CPU specific signal handler needed

diff --git a/exec-i386.h b/exec-i386.h
index 00da9b8a3d2f12fb2fc40e285f7388914fcb1c3a..af82370032c535e756367c4498cd51da3cbc33f7 100644 (file)
--- a/exec-i386.h
+++ b/exec-i386.h
@@ -124,6 +124,8 @@ register unsigned int A0 asm("$11");
 register unsigned int EAX asm("$12");
 register unsigned int ESP asm("$13");
 register unsigned int EBP asm("$14");
+/* Note $15 is the frame pointer, so anything in op-i386.c that would
+   require a frame pointer, like alloca, would probably loose.  */
 register struct CPUX86State *env asm("$15");
 #define reg_EAX
 #define reg_ESP

diff --git a/exec.h b/exec.h
index 18e75e67b0458d09234f2a3b3e7e23ef876a54b2..0098ad83acca77fb9b5430187773d23fd9c35606 100644 (file)
--- a/exec.h
+++ b/exec.h
@@ -214,7 +214,7 @@ static inline int testandset (int *p)
 #endif
 
 #ifdef __alpha__
-int testandset (int *p)
+static inline int testandset (int *p)
 {
     int ret;
     unsigned long one;

diff --git a/op-i386.c b/op-i386.c
index befa39f4df2fbea6d77e307c439b869db768c5ec..df841cec6733838fca2e2eb9eab252a727386c87 100644 (file)
--- a/op-i386.c
+++ b/op-i386.c
@@ -1762,16 +1762,16 @@ typedef union {
     double d;
 #ifndef WORDS_BIGENDIAN
     struct {
-        unsigned long lower;
-        long upper;
+        uint32_t lower;
+        int32_t upper;
     } l;
 #else
     struct {
-        long upper;
-        unsigned long lower;
+        int32_t upper;
+        uint32_t lower;
     } l;
 #endif
-    long long ll;
+    int64_t ll;
 } CPU86_LDoubleU;
 
 /* the following deal with IEEE double-precision numbers */