X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Fregalloc.h;h=f043ddd6d55402ab6a17fb6d5d48293693da53af;hb=cb4dfb5d9803365b73db03e34dc9900301b19a80;hp=d24026a907840b62f1867af6f6ff7d91ccbd1ece;hpb=878f81595d3d032c912721239722348bf1371613;p=mono.git

diff --git a/mono/mini/regalloc.h b/mono/mini/regalloc.h
index d24026a9078..f043ddd6d55 100644
--- a/mono/mini/regalloc.h
+++ b/mono/mini/regalloc.h
@@ -1,25 +1,21 @@
 
 typedef size_t regmask_t;
 
-enum {
-	MONO_REG_FREE,
-	MONO_REG_FREEABLE,
-	MONO_REG_MOVEABLE,
-	MONO_REG_BUSY,
-	MONO_REG_RESERVED
-};
-
 enum {
 	MONO_REG_INT,
 	MONO_REG_DOUBLE,
+	/* This is used only for allocating spill slots with GC tracking */
+	MONO_REG_INT_REF,
+	/* Ditto for managed pointers */
+	MONO_REG_INT_MP,
 	MONO_REG_SIMD
 };
 
  
 #ifdef MONO_ARCH_NEED_SIMD_BANK
-#define MONO_NUM_REGBANKS 3
+#define MONO_NUM_REGBANKS 5
 #else
-#define MONO_NUM_REGBANKS 2
+#define MONO_NUM_REGBANKS 4
 #endif
 
 typedef struct {
@@ -34,7 +30,7 @@ typedef struct {
 	 * If the register is spilled, then this contains -spill - 1, where 'spill'
 	 * is the index of the spill variable.
 	 */
-	gint16 *vassign;
+	gint32 *vassign;
 
 	/* hard -> symbolic */
 	int isymbolic [MONO_MAX_IREGS];
@@ -48,13 +44,6 @@ typedef struct {
 	int vassign_size;
 } MonoRegState;
 
-#define mono_regstate_next_int(rs)   ((rs)->next_vreg++)
-#define mono_regstate_next_float(rs) ((rs)->next_vreg++)
-
-
 MonoRegState* mono_regstate_new (void) MONO_INTERNAL;
 
 void          mono_regstate_free      (MonoRegState *rs) MONO_INTERNAL;
-void          mono_regstate_reset     (MonoRegState *rs) MONO_INTERNAL;
-inline int    mono_regstate_next_long (MonoRegState *rs) MONO_INTERNAL;
-