2008-08-22 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / regalloc.h

diff --git a/mono/mini/regalloc.h b/mono/mini/regalloc.h
index 4de636d1434e1a1a4157bd961ddb42527682092e..c2e798a48ed8e846ed50e28acb2bccbe40270dc4 100644 (file)
--- a/mono/mini/regalloc.h
+++ b/mono/mini/regalloc.h
@@ -16,12 +16,7 @@ enum {
 
 typedef struct {
        /* symbolic registers */
-       int next_vireg;
-       int next_vfreg;
-
-       /* hard registers */
-       int num_iregs;
-       int num_fregs;
+       int next_vreg;
 
        regmask_t ifree_mask;
        regmask_t ffree_mask;
@@ -31,31 +26,22 @@ typedef struct {
         * If the register is spilled, then this contains -spill - 1, where 'spill'
         * is the index of the spill variable.
         */
-       int *iassign;
-       int *fassign;
+       gint16 *vassign;
 
        /* hard -> symbolic */
        int isymbolic [MONO_MAX_IREGS];
        int fsymbolic [MONO_MAX_FREGS];
 
-       int max_ireg;
-       int ispills;
-
-       int iassign_size, fassign_size;
+       int vassign_size;
 } MonoRegState;
 
-#define mono_regstate_next_int(rs)   ((rs)->next_vireg++)
-#define mono_regstate_next_float(rs) ((rs)->next_vfreg++)
+#define mono_regstate_next_int(rs)   ((rs)->next_vreg++)
+#define mono_regstate_next_float(rs) ((rs)->next_vreg++)
 
 
-MonoRegState* mono_regstate_new (void);
+MonoRegState* mono_regstate_new (void) MONO_INTERNAL;
 
-void          mono_regstate_free      (MonoRegState *rs);
-void          mono_regstate_reset     (MonoRegState *rs);
-void          mono_regstate_assign    (MonoRegState *rs);
-int           mono_regstate_alloc_int   (MonoRegState *rs, regmask_t allow);
-void          mono_regstate_free_int  (MonoRegState *rs, int reg);
-int           mono_regstate_alloc_float (MonoRegState *rs, regmask_t allow);
-void          mono_regstate_free_float  (MonoRegState *rs, int reg);
-inline int    mono_regstate_next_long (MonoRegState *rs);
+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;