[commit: ghc] master: fix BCO_GET_LARGE_ARG (seems to be completely wrong) (78f5175)

Simon Marlow marlowsd at gmail.com
Wed Nov 2 17:40:10 CET 2011


Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/78f517598c61b4e4a173a9f255314b3ac0a41227

>---------------------------------------------------------------

commit 78f517598c61b4e4a173a9f255314b3ac0a41227
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 2 10:19:02 2011 +0000

    fix BCO_GET_LARGE_ARG (seems to be completely wrong)

>---------------------------------------------------------------

 rts/Interpreter.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rts/Interpreter.c b/rts/Interpreter.c
index 37e0e05..da151e1 100644
--- a/rts/Interpreter.c
+++ b/rts/Interpreter.c
@@ -67,7 +67,7 @@
 #else
 #error Cannot cope with WORD_SIZE_IN_BITS being nether 32 nor 64
 #endif
-#define BCO_GET_LARGE_ARG ((bci & bci_FLAG_LARGE_ARGS) ? BCO_NEXT_WORD : BCO_NEXT)
+#define BCO_GET_LARGE_ARG ((bci & bci_FLAG_LARGE_ARGS) ? BCO_READ_NEXT_WORD : BCO_NEXT)
 
 #define BCO_PTR(n)    (W_)ptrs[n]
 #define BCO_LIT(n)    literals[n]
@@ -804,7 +804,7 @@ run_BCO:
 		 //printStack(Sp,cap->r.rCurrentTSO->stack+cap->r.rCurrentTSO->stack_size,iSu);
 		 //debugBelch("-- END stack\n\n");
 		 //}
-		 debugBelch("Sp = %p   pc = %d      ", Sp, bciPtr);
+                 debugBelch("Sp = %p   pc = %-4d ", Sp, bciPtr);
 		 disInstr(bco,bciPtr);
 		 if (0) { int i;
 		 debugBelch("\n");





More information about the Cvs-ghc mailing list