[project @ 1999-07-27 13:29:08 by simonmar]

[ghc-hetmet.git] / ghc / rts / StgCRun.c

diff --git a/ghc/rts/StgCRun.c b/ghc/rts/StgCRun.c
index d8cc597..6d3109a 100644 (file)
--- a/ghc/rts/StgCRun.c
+++ b/ghc/rts/StgCRun.c
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgCRun.c,v 1.4 1999/03/01 17:42:11 simonm Exp $
+ * $Id: StgCRun.c,v 1.7 1999/07/27 13:29:08 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -38,6 +38,8 @@
 
 static jmp_buf jmp_environment;
 
+#if 0
+
 extern StgThreadReturnCode StgRun(StgFunPtr f)
 {
     jmp_buf save_buf;
@@ -45,7 +47,7 @@ extern StgThreadReturnCode StgRun(StgFunPtr f)
     memcpy((void *) jmp_environment, (void *) save_buf, sizeof(jmp_buf));
     if (setjmp(jmp_environment) == 0) {
        while ( 1 ) {
-           IF_DEBUG(evaluator,
+            IF_DEBUG(evaluator,
                     fprintf(stderr,"Jumping to ");
                     printPtr((P_)f);
                     fprintf(stderr,"\n");
@@ -64,6 +66,46 @@ EXTFUN(StgReturn)
     longjmp(jmp_environment, 1);
 }
 
+#else
+
+extern StgThreadReturnCode StgRun(StgFunPtr f)
+{
+    char* nm;
+    while ( f ) {
+
+#if 0
+      //IF_DEBUG(evaluator,
+                fprintf(stderr,"Jumping to ");
+                nm = nameOfObjSym ( f );
+                if (nm)
+                   fprintf(stderr, "%s (%p)", nm, f); else
+                   printPtr((P_)f);
+                fprintf(stderr,"\n");
+               //         );
+if (0&& MainRegTable.rSp) {
+   int i;
+   StgWord* p = MainRegTable.rSp;
+fprintf(stderr, "SP = %p\n", p);
+   p += (8-1);
+   for (i = 0; i < 8; i++, p--)
+      fprintf (stderr, "-- %p: %p\n", p, *p );
+}    
+#endif    
+
+       f = (StgFunPtr) (f)();
+    }
+
+    return (StgThreadReturnCode)R1.i;
+}
+
+EXTFUN(StgReturn)
+{
+   return 0;
+}
+#endif
+
+
+
 #else /* !USE_MINIINTERPRETER */
 
 #ifdef LEADING_UNDERSCORE
@@ -149,7 +191,7 @@ StgRun(StgFunPtr f)
     return (StgThreadReturnCode)R1.i;
 }
 
-#endif /* sparc_TARGET_ARCH */
+#endif /* alpha_TARGET_ARCH */
 
 /* -----------------------------------------------------------------------------
    HP-PA architecture
@@ -161,6 +203,8 @@ StgThreadReturnCode
 StgRun(StgFunPtr f) 
 {
     StgChar space[RESERVED_C_STACK_BYTES+16*sizeof(long)+10*sizeof(double)];
+    StgThreadReturnCode ret;
+
     __asm__ volatile ("ldo %0(%%r30),%%r19\n"
                      "\tstw %%r3, 0(0,%%r19)\n"
                       "\tstw %%r4, 4(0,%%r19)\n"
@@ -201,7 +245,8 @@ StgRun(StgFunPtr f)
                      "\t.EXPORT " STG_RETURN ",ENTRY,PRIV_LEV=3\n"
                       STG_RETURN "\n"
                       /* "\tldo %0(%%r3),%%r19\n" */
-                      "\tldo %0(%%r30),%%r19\n"
+                      "\tldo %1(%%r30),%%r19\n"
+                      "\tcopy %%r11, %0\n"  /* save R1 */
                      "\tldw  0(0,%%r19),%%r3\n"
                       "\tldw  4(0,%%r19),%%r4\n"
                       "\tldw  8(0,%%r19),%%r5\n"
@@ -230,11 +275,13 @@ StgRun(StgFunPtr f)
                      "\tfldds   8(0,%%r19),%%fr19\n"
                      "\tldo 32(%%r19),%%r19\n"
                      "\tfldds -16(0,%%r19),%%fr20\n"
-                     "\tfldds  -8(0,%%r19),%%fr21\n" : :
-                      "n" (-(116 * sizeof(long) + 10 * sizeof(double))) : "%r19"
+                     "\tfldds  -8(0,%%r19),%%fr21\n" 
+                        : "=r" (ret)
+                        : "n" (-(116 * sizeof(long) + 10 * sizeof(double)))
+                        : "%r19"
                      );
 
-    return (StgThreadReturnCode)R1.i;
+    return ret;
 }
 
 #endif /* hppa1_1_TARGET_ARCH */