use general as pointer flag added

diff --git a/util/ego/descr/i86.descr b/util/ego/descr/i86.descr
index 3ac0f92..1d2217e 100644 (file)
--- a/util/ego/descr/i86.descr
+++ b/util/ego/descr/i86.descr
@@ -4,6 +4,7 @@ pointersize: 2
 general registers: 2
 address registers: 0
 floating point registers: 0
+use general as pointer: yes
 
 register score parameters:
         local variable:

diff --git a/util/ego/descr/m68020.descr b/util/ego/descr/m68020.descr
index bff86c0..8fe2c56 100644 (file)
--- a/util/ego/descr/m68020.descr
+++ b/util/ego/descr/m68020.descr
@@ -4,6 +4,7 @@ pointersize: 4
 general registers: 5
 address registers: 4
 floating point registers: 0
+use general as pointer: no
 
 register score parameters:
        local variable:
@@ -69,7 +70,7 @@ opening cost parameters:
 register save costs:
        (11 cases)
        0 -> (0,0)
-       1 -> (12,4)
+       1 -> (12,6)
        2 -> (24,8)
        3 -> (34,8)
        4 -> (42,8)
@@ -102,4 +103,4 @@ do not eliminate sli if index on shiftcounts:       1 2 3 -1
                                                1 2 3 -1
 forbidden operators: -1 -1
 %%SP
-global stack pollution allowed?: no
+global stack pollution allowed?: yes

diff --git a/util/ego/descr/m68k2.descr b/util/ego/descr/m68k2.descr
index bd4bf43..9f525d4 100644 (file)
--- a/util/ego/descr/m68k2.descr
+++ b/util/ego/descr/m68k2.descr
@@ -4,6 +4,7 @@ pointersize: 4
 general registers: 5
 address registers: 4
 floating point registers: 0
+use general as pointer: no
 
 register score parameters:
        local variable:

diff --git a/util/ego/descr/m68k4.descr b/util/ego/descr/m68k4.descr
index d834b7d..3c0ffd7 100644 (file)
--- a/util/ego/descr/m68k4.descr
+++ b/util/ego/descr/m68k4.descr
@@ -4,6 +4,7 @@ pointersize: 4
 general registers: 5
 address registers: 4
 floating point registers: 0
+use general as pointer: no
 
 register score parameters:
        local variable:

diff --git a/util/ego/descr/pdp.descr b/util/ego/descr/pdp.descr
index f47f222..dbdbb02 100644 (file)
--- a/util/ego/descr/pdp.descr
+++ b/util/ego/descr/pdp.descr
@@ -4,6 +4,7 @@ pointersize: 2
 general registers: 2
 address registers: 0
 floating point registers: 0
+use general as pointer: yes
 
 register score parameters:
        local variable:

diff --git a/util/ego/descr/vax4.descr b/util/ego/descr/vax4.descr
index 94eebce..389d94e 100644 (file)
--- a/util/ego/descr/vax4.descr
+++ b/util/ego/descr/vax4.descr
@@ -4,6 +4,7 @@ pointersize: 4
 general registers: 8
 address registers: 0
 floating point registers: 0
+use general as pointer: yes
 
 register score parameters:
        local variable:

diff --git a/util/ego/ra/ra.c b/util/ego/ra/ra.c
index 844efbf..ef13c73 100644 (file)
--- a/util/ego/ra/ra.c
+++ b/util/ego/ra/ra.c
@@ -52,6 +52,8 @@ short regs_available[] = {
        0       /* reg_float */
 } ;
 
+short use_any_as_pointer = 0;
+
 STATIC cond_p getcondtab(f)
        FILE *f;
 {
@@ -114,6 +116,7 @@ STATIC ra_machinit(f)
        fscanf(f,"%hd",&regs_available[reg_any]);
        fscanf(f,"%hd",&regs_available[reg_pointer]);
        fscanf(f,"%hd",&regs_available[reg_float]);
+       fscanf(f,"%hd",&use_any_as_pointer);
        get_atab(f,alocaltab);
        get_atab(f,alocaddrtab);
        aconsttab = getcondtab(f);

diff --git a/util/ego/ra/ra.h b/util/ego/ra/ra.h
index 5b85115..fc9bfdb 100644 (file)
--- a/util/ego/ra/ra.h
+++ b/util/ego/ra/ra.h
@@ -36,6 +36,9 @@ typedef struct time *time_p;
 
 
 extern short regs_available[];  /* contains #registers of every type */
+extern short use_any_as_pointer;/* indicates whether general registers
+                                  can be used as pointers
+                               */
 
 
 /* A thing that can be put in a register is called an "item". The are several

diff --git a/util/ego/ra/ra_profits.c b/util/ego/ra/ra_profits.c
index 1d0717c..ab17fa7 100644 (file)
--- a/util/ego/ra/ra_profits.c
+++ b/util/ego/ra/ra_profits.c
@@ -65,7 +65,7 @@ allocscore(itemtyp,localtyp,size,off,totyp,time_out,space_out)
        offset off;
        short *time_out, *space_out;
 {
-       cond_p m;
+       cond_p m = (cond_p) 0;
 
        if (localtyp == reg_loop) localtyp = reg_any;
        if (size == ws || size ==ps && totyp == reg_pointer) {
@@ -74,7 +74,8 @@ allocscore(itemtyp,localtyp,size,off,totyp,time_out,space_out)
                        m = alocaltab[localtyp][totyp];
                        break;
                   case LOCAL_ADDR:
-                       m = alocaddrtab[localtyp][totyp];
+                       if (use_any_as_pointer || totyp == reg_pointer)
+                               m = alocaddrtab[localtyp][totyp];
                        break;
                   case CONST:
                        m = aconsttab;
@@ -83,14 +84,14 @@ allocscore(itemtyp,localtyp,size,off,totyp,time_out,space_out)
                        m = aconsttab;
                        break;
                   case GLOBL_ADDR:
-                       m = aglobaltab;
+                       if (use_any_as_pointer || totyp == reg_pointer)
+                               m = aglobaltab;
                        break;
                   case PROC_ADDR:
-                       m = aproctab;
+                       if (use_any_as_pointer || totyp == reg_pointer)
+                               m = aproctab;
                        break;
                }
-       } else {
-               m = (cond_p) 0;
        }
        *time_out = (m == (cond_p) 0 ? -1 : map_value(m,off,TRUE));
        *space_out = (m == (cond_p) 0 ? -1 : map_value(m,off,FALSE));