X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=source%2Fmupen64plus-core%2Fsrc%2Fr4300%2Fnew_dynarec%2Fnew_dynarec.c;h=e76e4c9be4c2f662ad5beb1c45764c93e7dbb28b;hb=e87f91c8bca5d4d5133bc095ead1ddfdac7f863b;hp=d1773243e841926b032a7e9466895d4b272161b8;hpb=587ca588c980303151df54eb8ae9a317996a7914;p=mupen64plus-pandora.git

diff --git a/source/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c b/source/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c
index d177324..e76e4c9 100755
--- a/source/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c
+++ b/source/mupen64plus-core/src/r4300/new_dynarec/new_dynarec.c
@@ -49,7 +49,7 @@
 
 #define MAXBLOCK 4096
 #define MAX_OUTPUT_BLOCK_SIZE 262144
-#define CLOCK_DIVIDER 2
+#define CLOCK_DIVIDER count_per_op
 
 void *base_addr;
 
@@ -272,7 +272,7 @@ static int verify_dirty(void *addr);
 //#define DEBUG_CYCLE_COUNT 1
 
 // Uncomment these two lines to generate debug output:
-//#define ASSEM_DEBUG 1
+#//define ASSEM_DEBUG 1
 //#define INV_DEBUG 1
 
 // Uncomment this line to output the number of NOTCOMPILED blocks as they occur:
@@ -1762,6 +1762,7 @@ void multdiv_alloc(struct regstat *current,int i)
       current->uu&=~(1LL<<HIREG);
       current->uu&=~(1LL<<LOREG);
       alloc_reg64(current,i,HIREG);
+	  alloc_reg64(current,i,LOREG);
       //if(HOST_REGS>10) alloc_reg64(current,i,LOREG);	//*SEB* Why commenting this line? uncommenting make SM64 freeze after title (before mario head and spinning stars)
       alloc_reg64(current,i,rs1[i]);
       alloc_reg64(current,i,rs2[i]);
@@ -1778,10 +1779,18 @@ void multdiv_alloc(struct regstat *current,int i)
     // Multiply by zero is zero.
     // MIPS does not have a divide by zero exception.
     // The result is undefined, we return zero.
-	alloc_reg(current,i,HIREG);
-	alloc_reg(current,i,LOREG);
-	current->is32|=1LL<<HIREG;
-	current->is32|=1LL<<LOREG;
+	if((opcode2[i]&4)==0) // 32-bit
+	{
+		alloc_reg(current,i,HIREG);
+		alloc_reg(current,i,LOREG);
+		current->is32|=1LL<<HIREG;
+		current->is32|=1LL<<LOREG;
+	} else {
+		alloc_reg64(current,i,HIREG);
+		alloc_reg64(current,i,LOREG);
+		current->is32&=~(1LL<<HIREG);
+		current->is32&=~(1LL<<LOREG);
+	}
 	dirty_reg(current,HIREG);
 	dirty_reg(current,LOREG);
   }