Author: zoltan
Date: 2007-02-28 09:03:54 -0500 (Wed, 28 Feb 2007)
New Revision: 73546
Added:
branches/vargaz/mini-linear-il/mono/winconfig.h
Modified:
branches/vargaz/mini-linear-il/mono/mono/metadata/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/metadata/marshal.c
branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
branches/vargaz/mini-linear-il/mono/mono/mini/Makefile.am
branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-alpha.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-mips.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-ppc.c
branches/vargaz/mini-linear-il/mono/mono/mini/mini-sparc.c
branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.c
branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.h
Log:
Merge from HEAD
Modified: branches/vargaz/mini-linear-il/mono/mono/metadata/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/metadata/ChangeLog 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/metadata/ChangeLog 2007-02-28
14:03:54 UTC (rev 73546)
@@ -1,4 +1,9 @@
+Mon Jan 29 11:30:46 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+ * marshal.c: fix from Robert Jordan ([EMAIL PROTECTED])
+ for bug #80618.
+
Fri Jan 26 12:49:23 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
* image.h, loader.c, metadata-internals.h: use mono-dl instead of
Modified: branches/vargaz/mini-linear-il/mono/mono/metadata/marshal.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/metadata/marshal.c 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/metadata/marshal.c 2007-02-28
14:03:54 UTC (rev 73546)
@@ -4558,7 +4558,7 @@
sig = mono_method_signature (method);
- csig = mono_metadata_signature_alloc (method->klass->image, 4);
+ csig = mono_metadata_signature_alloc (target_klass->image, 4);
csig->ret = &mono_defaults.object_class->byval_arg;
if (method->klass->valuetype && mono_method_signature (method)->hasthis)
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/ChangeLog 2007-02-28
14:03:54 UTC (rev 73546)
@@ -14,8 +14,24 @@
* method-to-ir.c (mini_emit_class_check): New helper function.
+Mon Jan 29 12:14:34 CET 2007 Paolo Molaro <[EMAIL PROTECTED]>
+
+ * Makefile.am: put back the --export-dynamic option as with
+ the previous gmodule flags (thanks to Robert Jordan).
+
2007-01-28 Zoltan Varga <[EMAIL PROTECTED]>
+ * mini-sparc.c (peephole_pass): Fix #80622 for sparc as well.
+
+ mini.h *.c: Allocate fp vregs from the same pool as the int vregs. Use
this to
+ simplify and speed up the local register allocator. Also rename some
fields
+ like iassign->vassign.
+
+ * regalloc.c: Remove some functions which are no longer used since their
+ inlined version is in mini-codegen.c.
+
+ * mini-codegen.c: Rename mono_regstate2_ functions to mono_regstate_.
+
* basic.cs objects.cs iltests.il: Merge tests from the linear IL branch.
2007-01-27 Zoltan Varga <[EMAIL PROTECTED]>
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/Makefile.am
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/Makefile.am 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/Makefile.am 2007-02-28
14:03:54 UTC (rev 73546)
@@ -53,11 +53,11 @@
genmdesc_CFLAGS = $(AM_CFLAGS)
if NO_VERSION_SCRIPT
-monoldflags=
-monobinldflags=
+monoldflags=$(export_ldflags)
+monobinldflags=$(export_ldflags)
else
-monoldflags=-Wl,-version-script=$(srcdir)/ldscript
-monobinldflags=-Wl,-version-script=$(srcdir)/ldscript.mono
+monoldflags=-Wl,-version-script=$(srcdir)/ldscript $(export_ldflags)
+monobinldflags=-Wl,-version-script=$(srcdir)/ldscript.mono $(export_ldflags)
endif
if PLATFORM_WIN32
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-02-28 13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/method-to-ir.c
2007-02-28 14:03:54 UTC (rev 73546)
@@ -10027,7 +10027,7 @@
* parts of the tree could be separated by other instructions, killing the
tree
* arguments, or stores killing loads etc. Also, should we fold loads into
other
* instructions if the result of the load is used multiple times ?
- * - LAST MERGE: 71800.
+ * - LAST MERGE: 71900.
*/
/*
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-alpha.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-alpha.c 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-alpha.c 2007-02-28
14:03:54 UTC (rev 73546)
@@ -1487,7 +1487,7 @@
/* Save (global) regs */
offset = cfg->arch.reg_save_area_offset;
- for (i = 0; i < MONO_MAX_IREGS; ++i)
+ for (i = 0; i < MONO_MAX_VREGS; ++i)
if (ALPHA_IS_CALLEE_SAVED_REG (i) &&
(cfg->used_int_regs & (1 << i)) &&
!( ALPHA_ARGS_REGS & (1 << i)) )
@@ -1584,7 +1584,7 @@
offset = cfg->arch.reg_save_area_offset;
/*
- for (i = 0; i < MONO_MAX_IREGS; ++i)
+ for (i = 0; i < MONO_MAX_VREGS; ++i)
if (ALPHA_IS_CALLEE_SAVED_REG (i) &&
(cfg->used_int_regs & (1 << i)) &&
!( ALPHA_ARGS_REGS & (1 << i)) )
@@ -1818,7 +1818,7 @@
// Restore saved regs
offset = cfg->arch.reg_save_area_offset;
- for (i = 0; i < MONO_MAX_IREGS; ++i)
+ for (i = 0; i < MONO_MAX_VREGS; ++i)
if (ALPHA_IS_CALLEE_SAVED_REG (i) &&
(cfg->used_int_regs & (1 << i)) &&
!( ALPHA_ARGS_REGS & (1 << i)) )
@@ -5671,7 +5671,7 @@
CFG_DEBUG(3) g_print ("ALPHA: reg_save_area_offset at %d(%x)\n", offset,
offset);
// Reserve space for caller saved registers
- for (i = 0; i < MONO_MAX_IREGS; ++i)
+ for (i = 0; i < MONO_MAX_VREGS; ++i)
if ((ALPHA_IS_CALLEE_SAVED_REG (i)) &&
(cfg->used_int_regs & (1 << i)))
{
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c
2007-02-28 13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-codegen.c
2007-02-28 14:03:54 UTC (rev 73546)
@@ -69,23 +69,22 @@
}
static inline void
-mono_regstate2_init (MonoRegState *rs) {
- rs->max_vreg = -1;
-
- if (rs->next_vreg != rs->vassign_size) {
+mono_regstate_assign (MonoRegState *rs) {
+ if (rs->next_vreg > rs->vassign_size) {
g_free (rs->vassign);
- rs->vassign = g_malloc (MAX (MONO_MAX_IREGS, rs->next_vreg) *
sizeof (int));
- rs->vassign_size = rs->next_vreg;
+ rs->vassign_size = MAX (rs->next_vreg, 256);
+ rs->vassign = g_malloc (rs->vassign_size * sizeof (int));
}
+
memset (rs->isymbolic, 0, MONO_MAX_IREGS * sizeof (rs->isymbolic [0]));
+ memset (rs->vassign, -1, sizeof (rs->vassign [0]) * rs->next_vreg);
+
memset (rs->fsymbolic, 0, MONO_MAX_FREGS * sizeof (rs->fsymbolic [0]));
-
- /* vassign can be very large so it needs to be initialized by the
caller */
}
static inline int
-mono_regstate2_alloc_int (MonoRegState *rs, regmask_t allow)
+mono_regstate_alloc_int (MonoRegState *rs, regmask_t allow)
{
regmask_t mask = allow & rs->ifree_mask;
@@ -116,7 +115,7 @@
}
static inline void
-mono_regstate2_free_int (MonoRegState *rs, int reg)
+mono_regstate_free_int (MonoRegState *rs, int reg)
{
if (reg >= 0) {
rs->ifree_mask |= (regmask_t)1 << reg;
@@ -125,7 +124,7 @@
}
static inline int
-mono_regstate2_alloc_float (MonoRegState *rs, regmask_t allow)
+mono_regstate_alloc_float (MonoRegState *rs, regmask_t allow)
{
int i;
regmask_t mask = allow & rs->ffree_mask;
@@ -139,7 +138,7 @@
}
static inline void
-mono_regstate2_free_float (MonoRegState *rs, int reg)
+mono_regstate_free_float (MonoRegState *rs, int reg)
{
if (reg >= 0) {
rs->ffree_mask |= (regmask_t)1 << reg;
@@ -595,12 +594,13 @@
{
MonoInst *load;
int i, sel, spill;
- int *symbolic;
+ int *assign, *symbolic;
+ assign = cfg->rs->vassign;
if (fp)
- symbolic = rs->fsymbolic;
+ symbolic = cfg->rs->fsymbolic;
else
- symbolic = rs->isymbolic;
+ symbolic = cfg->rs->isymbolic;
sel = rs->vassign [reg];
@@ -610,9 +610,9 @@
spill = ++cfg->spill_count;
rs->vassign [i] = -spill - 1;
if (fp)
- mono_regstate2_free_float (rs, sel);
+ mono_regstate_free_float (cfg->rs, sel);
else
- mono_regstate2_free_int (rs, sel);
+ mono_regstate_free_int (cfg->rs, sel);
/* we need to create a spill var and insert a load to sel after the
current instruction */
if (fp)
MONO_INST_NEW (cfg, load, OP_LOADR8_MEMBASE);
@@ -624,9 +624,9 @@
insert_after_ins (ins, item, load);
DEBUG (printf ("SPILLED LOAD (%d at 0x%08lx(%%ebp)) R%d (freed %s)\n",
spill, (long)load->inst_offset, i, mono_regname_full (sel, fp)));
if (fp)
- i = mono_regstate2_alloc_float (rs, regmask (sel));
+ i = mono_regstate_alloc_float (cfg->rs, regmask (sel));
else
- i = mono_regstate2_alloc_int (rs, regmask (sel));
+ i = mono_regstate_alloc_int (cfg->rs, regmask (sel));
g_assert (i == sel);
return sel;
@@ -642,12 +642,13 @@
{
MonoInst *load;
int i, sel, spill;
- int *symbolic;
+ int *assign, *symbolic;
+ assign = cfg->rs->vassign;
if (fp)
- symbolic = rs->fsymbolic;
+ symbolic = cfg->rs->fsymbolic;
else
- symbolic = rs->isymbolic;
+ symbolic = cfg->rs->isymbolic;
DEBUG (printf ("\tstart regmask to assign R%d: 0x%08" G_GUINT64_FORMAT
" (R%d <- R%d R%d)\n", reg, (guint64)regmask, ins->dreg, ins->sreg1,
ins->sreg2));
/* exclude the registers in the current instruction */
@@ -686,7 +687,7 @@
i = rs->fsymbolic [sel];
spill = ++cfg->spill_count;
rs->vassign [i] = -spill - 1;
- mono_regstate2_free_float (rs, sel);
+ mono_regstate_free_float (cfg->rs, sel);
}
else {
for (i = 0; i < MONO_MAX_IREGS; ++i) {
@@ -700,7 +701,7 @@
i = rs->isymbolic [sel];
spill = ++cfg->spill_count;
rs->vassign [i] = -spill - 1;
- mono_regstate2_free_int (rs, sel);
+ mono_regstate_free_int (cfg->rs, sel);
}
/* we need to create a spill var and insert a load to sel after the
current instruction */
@@ -711,9 +712,9 @@
insert_after_ins (ins, item, load);
DEBUG (printf ("\tSPILLED LOAD (%d at 0x%08lx(%%ebp)) R%d (freed
%s)\n", spill, (long)load->inst_offset, i, mono_regname_full (sel, fp)));
if (fp)
- i = mono_regstate2_alloc_float (rs, regmask (sel));
+ i = mono_regstate_alloc_float (cfg->rs, regmask (sel));
else
- i = mono_regstate2_alloc_int (rs, regmask (sel));
+ i = mono_regstate_alloc_int (cfg->rs, regmask (sel));
g_assert (i == sel);
return sel;
@@ -725,7 +726,7 @@
if (!(cfg->rs->ifree_mask & (regmask (hreg)))) {
DEBUG (printf ("\tforced spill of R%d\n", cfg->rs->isymbolic
[hreg]));
get_register_force_spilling (cfg, cfg->rs, item, ins,
cfg->rs->isymbolic [hreg], FALSE);
- mono_regstate2_free_int (cfg->rs, hreg);
+ mono_regstate_free_int (cfg->rs, hreg);
}
}
@@ -736,14 +737,14 @@
if (!(cfg->rs->ffree_mask & (regmask (hreg)))) {
DEBUG (printf ("\tforced spill of R%d\n",
cfg->rs->isymbolic [hreg]));
get_register_force_spilling (cfg, cfg->rs, item, ins,
cfg->rs->isymbolic [hreg], fp);
- mono_regstate2_free_float (cfg->rs, hreg);
+ mono_regstate_free_float (cfg->rs, hreg);
}
}
else {
if (!(cfg->rs->ifree_mask & (regmask (hreg)))) {
DEBUG (printf ("\tforced spill of R%d\n",
cfg->rs->isymbolic [hreg]));
get_register_force_spilling (cfg, cfg->rs, item, ins,
cfg->rs->isymbolic [hreg], fp);
- mono_regstate2_free_int (cfg->rs, hreg);
+ mono_regstate_free_int (cfg->rs, hreg);
}
}
}
@@ -799,14 +800,14 @@
int val;
if (info && info->preferred_mask) {
- val = mono_regstate2_alloc_int (cfg->rs, info->preferred_mask &
dest_mask);
+ val = mono_regstate_alloc_int (cfg->rs, info->preferred_mask &
dest_mask);
if (val >= 0) {
DEBUG (printf ("\tallocated preferred reg R%d to %s\n",
sym_reg, mono_arch_regname (val)));
return val;
}
}
- val = mono_regstate2_alloc_int (cfg->rs, dest_mask);
+ val = mono_regstate_alloc_int (cfg->rs, dest_mask);
if (val < 0)
val = get_register_spilling (cfg, cfg->rs, tmp, ins, dest_mask,
sym_reg, FALSE);
@@ -818,7 +819,7 @@
{
int val;
- val = mono_regstate2_alloc_float (cfg->rs, dest_mask);
+ val = mono_regstate_alloc_float (cfg->rs, dest_mask);
if (val < 0) {
val = get_register_spilling (cfg, cfg->rs, tmp, ins, dest_mask,
sym_reg, TRUE);
@@ -893,10 +894,12 @@
return;
rs->next_vreg = bb->max_vreg;
- mono_regstate2_init (rs);
+ mono_regstate_assign (rs);
+
rs->ifree_mask = MONO_ARCH_CALLEE_REGS;
rs->ffree_mask = MONO_ARCH_CALLEE_FREGS;
+
max = rs->next_vreg;
ins_count = 0;
@@ -1232,7 +1235,7 @@
if (need_spill) {
DEBUG (printf ("\tforced spill of
R%d\n", rs->isymbolic [dest_sreg2]));
get_register_force_spilling (cfg, rs,
tmp, ins, rs->isymbolic [dest_sreg2], FALSE);
- mono_regstate2_free_int (rs,
dest_sreg2);
+ mono_regstate_free_int (rs, dest_sreg2);
}
if (!is_global_ireg (ins->sreg2))
@@ -1264,7 +1267,7 @@
if (is_soft_reg (ins->dreg, fp) && (val >= 0) &&
(!(regmask (val) & dreg_mask))) {
/* DREG is already allocated to a register
needed for sreg1 */
get_register_force_spilling (cfg, rs, tmp, ins,
ins->dreg, FALSE);
- mono_regstate2_free_int (rs, val);
+ mono_regstate_free_int (rs, val);
}
}
@@ -1297,10 +1300,10 @@
* The argument is already in a hard reg, but
that reg is
* not usable by this instruction, so allocate
a new one.
*/
- val = mono_regstate2_alloc_int (rs,
dreg_fixed_mask);
+ val = mono_regstate_alloc_int (rs,
dreg_fixed_mask);
if (val < 0)
val = get_register_spilling (cfg, rs,
tmp, ins, dreg_fixed_mask, -1, fp);
- mono_regstate2_free_int (rs, val);
+ mono_regstate_free_int (rs, val);
dest_dreg = val;
/* Fall through */
@@ -1347,7 +1350,7 @@
/* the register gets spilled after this
inst */
spill = -val -1;
}
- val = mono_regstate2_alloc_int (rs, mask);
+ val = mono_regstate_alloc_int (rs, mask);
if (val < 0)
val = get_register_spilling (cfg, rs,
tmp, ins, mask, reg2, fp);
if (spill)
@@ -1355,14 +1358,14 @@
}
else {
if (! (mask & (regmask (val)))) {
- val = mono_regstate2_alloc_int (rs,
mask);
+ val = mono_regstate_alloc_int (rs,
mask);
if (val < 0)
val = get_register_spilling
(cfg, rs, tmp, ins, mask, reg2, fp);
/* Reallocate hreg to the correct
register */
create_copy_ins (cfg, rs->vassign
[reg2], val, ins, ip, fp);
- mono_regstate2_free_int (rs,
rs->vassign [reg2]);
+ mono_regstate_free_int (rs, rs->vassign
[reg2]);
}
}
@@ -1374,7 +1377,7 @@
if (reg_is_freeable (val, fp) && reg2 >= 0 && (reginfo
[reg2].born_in >= i)) {
DEBUG (printf ("\tfreeable %s (R%d)\n",
mono_arch_regname (val), reg2));
- mono_regstate2_free_int (rs, val);
+ mono_regstate_free_int (rs, val);
}
}
@@ -1388,9 +1391,9 @@
g_assert (dreg >= 0);
DEBUG (printf ("\tfreeable %s (R%d) (born in %d)\n",
mono_regname_full (dreg, fp), prev_dreg, reginfo [prev_dreg].born_in));
if (fp)
- mono_regstate2_free_float (rs, dreg);
+ mono_regstate_free_float (rs, dreg);
else
- mono_regstate2_free_int (rs, dreg);
+ mono_regstate_free_int (rs, dreg);
}
if ((dest_dreg != -1) && (ins->dreg != dest_dreg)) {
@@ -1425,7 +1428,7 @@
if ((clob_reg != -1) && (!(rs->ifree_mask & (regmask
(clob_reg))))) {
DEBUG (printf ("\tforced spill of clobbered reg R%d\n",
rs->isymbolic [clob_reg]));
get_register_force_spilling (cfg, rs, tmp, ins,
rs->isymbolic [clob_reg], FALSE);
- mono_regstate2_free_int (rs, clob_reg);
+ mono_regstate_free_int (rs, clob_reg);
}
if (spec [MONO_INST_CLOB] == 'c') {
@@ -1456,7 +1459,7 @@
else if (rs->isymbolic [j])
/* The hreg is assigned to the
dreg of this instruction */
rs->vassign [rs->isymbolic [j]]
= -1;
- mono_regstate2_free_int (rs, j);
+ mono_regstate_free_int (rs, j);
}
}
@@ -1474,7 +1477,7 @@
else if (rs->fsymbolic [j])
/* The hreg is assigned to the
dreg of this instruction */
rs->vassign [rs->fsymbolic [j]]
= -1;
- mono_regstate2_free_float (rs, j);
+ mono_regstate_free_float (rs, j);
}
}
}
@@ -1546,14 +1549,14 @@
/* To simplify things, we allocate the same
regpair to sreg1 and dreg */
if (dest_sreg1 != -1)
g_assert (dest_sreg1 == ins->dreg);
- val = mono_regstate2_alloc_int (rs, regmask
(ins->dreg));
+ val = mono_regstate_alloc_int (rs, regmask
(ins->dreg));
g_assert (val >= 0);
assign_reg (cfg, rs, ins->sreg1, val, fp);
DEBUG (printf ("\tassigned sreg1-low %s to
R%d\n", mono_regname_full (val, fp), ins->sreg1));
g_assert ((regmask (dreg_high)) &
regpair_reg2_mask (spec [MONO_INST_SRC1], ins->dreg));
- val = mono_regstate2_alloc_int (rs, regmask
(dreg_high));
+ val = mono_regstate_alloc_int (rs, regmask
(dreg_high));
g_assert (val >= 0);
assign_reg (cfg, rs, ins->sreg1 + 1, val, fp);
@@ -1570,10 +1573,10 @@
* The argument is already in a hard
reg, but that reg is
* not usable by this instruction, so
allocate a new one.
*/
- val = mono_regstate2_alloc_int (rs,
sreg1_fixed_mask);
+ val = mono_regstate_alloc_int (rs,
sreg1_fixed_mask);
if (val < 0)
val = get_register_spilling
(cfg, rs, tmp, ins, sreg1_fixed_mask, -1, fp);
- mono_regstate2_free_int (rs, val);
+ mono_regstate_free_int (rs, val);
dest_sreg1 = val;
/* Fall through to the dest_sreg1 != -1
case */
@@ -1588,7 +1591,7 @@
if ((rs->vassign [ins->sreg1] != dest_sreg1) &&
!(rs->ifree_mask & (regmask (dest_sreg1)))) {
DEBUG (printf ("\tforced spill of
R%d\n", rs->isymbolic [dest_sreg1]));
get_register_force_spilling (cfg, rs,
tmp, ins, rs->isymbolic [dest_sreg1], FALSE);
- mono_regstate2_free_int (rs,
dest_sreg1);
+ mono_regstate_free_int (rs, dest_sreg1);
}
if (is_global_ireg (ins->sreg1)) {
/* The argument is already in a hard
reg, need to copy */
@@ -1659,7 +1662,7 @@
/* the register gets spilled after this
inst */
spill = -val -1;
}
- val = mono_regstate2_alloc_int (rs, mask);
+ val = mono_regstate_alloc_int (rs, mask);
if (val < 0)
val = get_register_spilling (cfg, rs,
tmp, ins, mask, reg2, fp);
if (spill)
@@ -1671,14 +1674,14 @@
/* FIXME: */
g_assert_not_reached ();
#if 0
- val = mono_regstate2_alloc_int (rs,
mask);
+ val = mono_regstate_alloc_int (rs,
mask);
if (val < 0)
val = get_register_spilling
(cfg, rs, tmp, ins, mask, reg2, fp);
/* Reallocate hreg to the correct
register */
create_copy_ins (cfg, rs->vassign
[reg2], val, ins, ip, fp);
- mono_regstate2_free_int (rs,
rs->vassign [reg2]);
+ mono_regstate_free_int (rs, rs->vassign
[reg2]);
#endif
}
}
@@ -1706,9 +1709,9 @@
prev_sreg2 = ins->sreg2 = reg2;
if (fp)
- mono_regstate2_free_float (rs, reg2);
+ mono_regstate_free_float (rs, reg2);
else
- mono_regstate2_free_int (rs, reg2);
+ mono_regstate_free_int (rs, reg2);
}
if (MONO_ARCH_INST_IS_REGPAIR (spec [MONO_INST_SRC1])) {
@@ -1777,11 +1780,11 @@
/*if (reg_is_freeable (ins->sreg1) && prev_sreg1 >= 0 &&
reginfo [prev_sreg1].born_in >= i) {
DEBUG (printf ("freeable %s\n", mono_arch_regname
(ins->sreg1)));
- mono_regstate2_free_int (rs, ins->sreg1);
+ mono_regstate_free_int (rs, ins->sreg1);
}
if (reg_is_freeable (ins->sreg2) && prev_sreg2 >= 0 && reginfo
[prev_sreg2].born_in >= i) {
DEBUG (printf ("freeable %s\n", mono_arch_regname
(ins->sreg2)));
- mono_regstate2_free_int (rs, ins->sreg2);
+ mono_regstate_free_int (rs, ins->sreg2);
}*/
DEBUG (mono_print_ins_index (i, ins));
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-mips.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-mips.c 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-mips.c 2007-02-28
14:03:54 UTC (rev 73546)
@@ -1066,7 +1066,7 @@
iregs_to_save = (cfg->used_int_regs & MONO_ARCH_CALLEE_SAVED_REGS);
#endif
if (iregs_to_save) {
- for (i = MONO_MAX_IREGS-1; i >= 0; --i) {
+ for (i = MONO_MAX_VREGS-1; i >= 0; --i) {
if (iregs_to_save & (1 << i)) {
offset += sizeof (gulong);
}
@@ -1587,8 +1587,8 @@
int imm;
/* setup the virtual reg allocator */
- if (bb->max_ireg > cfg->rs->next_vireg)
- cfg->rs->next_vireg = bb->max_ireg;
+ if (bb->max_vreg > cfg->rs->next_vreg)
+ cfg->rs->next_vreg = bb->max_vreg;
ins = bb->code;
while (ins) {
@@ -1735,7 +1735,7 @@
ins = ins->next;
}
bb->last_ins = last_ins;
- bb->max_ireg = cfg->rs->next_vireg;
+ bb->max_vreg = cfg->rs->next_vreg;
}
void
@@ -3382,7 +3382,7 @@
if (iregs_to_save) {
/* save used registers in own stack frame (at pos) */
pos = cfg->arch.iregs_offset;
- for (i = MONO_MAX_IREGS-1; i >= 0; --i) {
+ for (i = MONO_MAX_VREGS-1; i >= 0; --i) {
if (iregs_to_save & (1 << i)) {
g_assert (pos < cfg->stack_usage - 4);
mips_sw (code, i, mips_sp, pos);
@@ -3768,7 +3768,7 @@
iregs_to_restore = (cfg->used_int_regs & MONO_ARCH_CALLEE_SAVED_REGS);
#endif
if (iregs_to_restore) {
- for (i = MONO_MAX_IREGS-1; i >= 0; --i) {
+ for (i = MONO_MAX_VREGS-1; i >= 0; --i) {
if (iregs_to_restore & (1 << i)) {
mips_lw (code, i, mips_sp, pos);
pos += sizeof (gulong);
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-ppc.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-ppc.c 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-ppc.c 2007-02-28
14:03:54 UTC (rev 73546)
@@ -1820,8 +1820,8 @@
rs->ffree_mask = PPC_CALLER_FREGS;
=======
/* setup the virtual reg allocator */
- if (bb->max_ireg > cfg->rs->next_vireg)
- cfg->rs->next_vireg = bb->max_ireg;
+ if (bb->max_vreg > cfg->rs->next_vreg)
+ cfg->rs->next_vreg = bb->max_vreg;
>>>>>>> .merge-right.r66840
ins = bb->code;
@@ -2124,7 +2124,7 @@
cfg->max_vreg = MAX (cfg->max_vreg, rs->max_vreg);
=======
bb->last_ins = last_ins;
- bb->max_ireg = cfg->rs->next_vireg;
+ bb->max_vreg = cfg->rs->next_vreg;
>>>>>>> .merge-right.r66840
}
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/mini-sparc.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/mini-sparc.c 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/mini-sparc.c 2007-02-28
14:03:54 UTC (rev 73546)
@@ -1959,7 +1959,6 @@
}
break;
#endif
- case OP_LOADU1_MEMBASE:
case OP_LOADI1_MEMBASE:
if (last_ins && (last_ins->opcode ==
OP_STOREI1_MEMBASE_REG) &&
ins->inst_basereg ==
last_ins->inst_destbasereg &&
@@ -1975,7 +1974,6 @@
}
}
break;
- case OP_LOADU2_MEMBASE:
case OP_LOADI2_MEMBASE:
if (last_ins && (last_ins->opcode ==
OP_STOREI2_MEMBASE_REG) &&
ins->inst_basereg ==
last_ins->inst_destbasereg &&
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.c
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.c 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.c 2007-02-28
14:03:54 UTC (rev 73546)
@@ -29,74 +29,6 @@
rs->next_vreg = MAX (MONO_MAX_IREGS, MONO_MAX_FREGS);
}
-void
-mono_regstate_assign (MonoRegState *rs) {
- int i;
- rs->max_vreg = -1;
-
- if (rs->next_vreg != rs->vassign_size) {
- g_free (rs->vassign);
- rs->vassign = g_malloc (MAX (MONO_MAX_IREGS, rs->next_vreg) *
sizeof (int));
- rs->vassign_size = rs->next_vreg;
- }
-
- for (i = 0; i < MAX (MONO_MAX_IREGS, MONO_MAX_FREGS); ++i)
- rs->vassign [i] = i;
- for (i = 0; i < MONO_MAX_IREGS; ++i)
- rs->isymbolic [i] = 0;
- for (i = 0; i < MONO_MAX_FREGS; ++i)
- rs->fsymbolic [i] = 0;
-
- /* vassign can be very large so it needs to be initialized by the
caller */
-}
-
-int
-mono_regstate_alloc_int (MonoRegState *rs, regmask_t allow)
-{
- int i;
- regmask_t mask = allow & rs->ifree_mask;
- for (i = 0; i < MONO_MAX_IREGS; ++i) {
- if (mask & ((regmask_t)1 << i)) {
- rs->ifree_mask &= ~ ((regmask_t)1 << i);
- rs->max_vreg = MAX (rs->max_vreg, i);
- return i;
- }
- }
- return -1;
-}
-
-void
-mono_regstate_free_int (MonoRegState *rs, int reg)
-{
- if (reg >= 0) {
- rs->ifree_mask |= (regmask_t)1 << reg;
- rs->isymbolic [reg] = 0;
- }
-}
-
-int
-mono_regstate_alloc_float (MonoRegState *rs, regmask_t allow)
-{
- int i;
- regmask_t mask = allow & rs->ffree_mask;
- for (i = 0; i < MONO_MAX_FREGS; ++i) {
- if (mask & ((regmask_t)1 << i)) {
- rs->ffree_mask &= ~ ((regmask_t)1 << i);
- return i;
- }
- }
- return -1;
-}
-
-void
-mono_regstate_free_float (MonoRegState *rs, int reg)
-{
- if (reg >= 0) {
- rs->ffree_mask |= (regmask_t)1 << reg;
- rs->fsymbolic [reg] = 0;
- }
-}
-
inline int
mono_regstate_next_long (MonoRegState *rs)
{
Modified: branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.h 2007-02-28
13:55:28 UTC (rev 73545)
+++ branches/vargaz/mini-linear-il/mono/mono/mini/regalloc.h 2007-02-28
14:03:54 UTC (rev 73546)
@@ -36,7 +36,6 @@
int isymbolic [MONO_MAX_IREGS];
int fsymbolic [MONO_MAX_FREGS];
- int max_vreg;
int ispills;
int vassign_size;
@@ -50,10 +49,5 @@
void mono_regstate_free (MonoRegState *rs) MONO_INTERNAL;
void mono_regstate_reset (MonoRegState *rs) MONO_INTERNAL;
-void mono_regstate_assign (MonoRegState *rs) MONO_INTERNAL;
-int mono_regstate_alloc_int (MonoRegState *rs, regmask_t allow)
MONO_INTERNAL;
-void mono_regstate_free_int (MonoRegState *rs, int reg)
MONO_INTERNAL;
-int mono_regstate_alloc_float (MonoRegState *rs, regmask_t allow)
MONO_INTERNAL;
-void mono_regstate_free_float (MonoRegState *rs, int reg)
MONO_INTERNAL;
inline int mono_regstate_next_long (MonoRegState *rs) MONO_INTERNAL;
Added: branches/vargaz/mini-linear-il/mono/winconfig.h
===================================================================
--- branches/vargaz/mini-linear-il/mono/winconfig.h 2007-02-28 13:55:28 UTC
(rev 73545)
+++ branches/vargaz/mini-linear-il/mono/winconfig.h 2007-02-28 14:03:54 UTC
(rev 73546)
@@ -0,0 +1,439 @@
+/* config.h. Generated by configure. */
+/* config.h.in. Generated from configure.in by autoheader. */
+/* #undef HAVE_INET_PTON */
+/* #undef HAVE_INET_ATON */
+/* #undef HAVE_MSG_NOSIGNAL */
+/* #undef HAVE_SOL_IP */
+/* #undef HAVE_SOL_TCP */
+/* #undef HAVE_SOL_IPV6 */
+/* #undef HAVE_IP_PKTINFO */
+/* #undef HAVE_IPV6_PKTINFO */
+/* #undef HAVE_STRUCT_IP_MREQN */
+#define HAVE_STRUCT_IP_MREQ 1
+/* #undef HAVE_PTHREAD_MUTEX_TIMEDLOCK */
+/* #undef USE_MONO_MUTEX */
+/* #undef HAVE_LARGE_FILE_SUPPORT */
+/* #undef HAVE_NEW_ICONV */
+#define NAME_DEV_RANDOM ""
+#define HAVE_CRYPT_RNG 1
+#define HAVE_BOEHM_GC 1
+#define USE_INCLUDED_LIBGC 1
+/* #undef DISABLE_SHARED_HANDLES */
+/* #undef HAVE_TIMEZONE */
+/* #undef HAVE_TM_GMTOFF */
+/* #undef MONO_SIZEOF_SUNPATH */
+/* #undef MONO_ZERO_ARRAY_LENGTH */
+/* #undef PTHREAD_POINTER_ID */
+#define HAVE_GC_H 1
+#define HAVE_GC_GCJ_MALLOC 1
+#define HAVE_GC_ENABLE 1
+/* #undef WITH_BUNDLE */
+/* #undef HAVE_GETHOSTBYNAME2_R */
+/* #undef HAVE_ICU */
+/* #undef HAVE_KW_THREAD */
+/* #undef HAVE_SIGNBIT */
+/* #undef USE_MACH_SEMA */
+/* #undef HAVE_SOCKLEN_T */
+/* #undef HAVE_TRUNCL */
+/* #undef HAVE_AINTL */
+/* #undef HAVE_SCANDIR */
+/* #undef HAVE_WORKING_SIGALTSTACK */
+
+/* The architecture this is running on */
+#define ARCHITECTURE "x86"
+
+/* String of disabled features */
+#define DISABLED_FEATURES "none"
+
+/* Disable AOT support */
+/* #undef DISABLE_AOT */
+
+/* Disable COM support */
+/* #undef DISABLE_COM */
+
+/* Disable runtime debugging support */
+/* #undef DISABLE_DEBUG */
+
+/* Disable System.Decimal support */
+/* #undef DISABLE_DECIMAL */
+
+/* Disable generics support */
+/* #undef DISABLE_GENERICS */
+
+/* Disable support for huge assemblies */
+/* #undef DISABLE_LARGE_CODE */
+
+/* Disable support debug logging */
+/* #undef DISABLE_LOGGING */
+
+/* Disable P/Invoke support */
+/* #undef DISABLE_PINVOKE */
+
+/* Disable default profiler support */
+/* #undef DISABLE_PROFILER */
+
+/* Disable reflection emit support */
+/* #undef DISABLE_REFLECTION_EMIT */
+
+/* Disable advanced SSA JIT optimizations */
+/* #undef DISABLE_SSA */
+
+/* Define to 1 if you have the <aio.h> header file. */
+/* #undef HAVE_AIO_H */
+
+/* Supports C99 array initialization */
+/* #undef HAVE_ARRAY_ELEM_INIT */
+
+/* Define to 1 if you have the <attr/xattr.h> header file. */
+/* #undef HAVE_ATTR_XATTR_H */
+
+/* Define to 1 if you have the `backtrace_symbols' function. */
+/* #undef HAVE_BACKTRACE_SYMBOLS */
+
+/* Define to 1 if you have the <checklist.h> header file. */
+/* #undef HAVE_CHECKLIST_H */
+
+/* Define to 1 if you have the <curses.h> header file. */
+/* #undef HAVE_CURSES_H */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the <elf.h> header file. */
+/* #undef HAVE_ELF_H */
+
+/* epoll supported */
+/* #undef HAVE_EPOLL */
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+/* #undef HAVE_EPOLL_CTL */
+
+/* Define to 1 if you have the <execinfo.h> header file. */
+/* #undef HAVE_EXECINFO_H */
+
+/* Define to 1 if you have the `fgetgrent' function. */
+/* #undef HAVE_FGETGRENT */
+
+/* Define to 1 if you have the `fgetpwent' function. */
+/* #undef HAVE_FGETPWENT */
+
+/* Define to 1 if you have the `finite' function. */
+/* #undef HAVE_FINITE */
+
+/* Define to 1 if you have the <fstab.h> header file. */
+/* #undef HAVE_FSTAB_H */
+
+/* Define to 1 if you have the `fstatfs' function. */
+/* #undef HAVE_FSTATFS */
+
+/* Define to 1 if you have the `fstatvfs' function. */
+/* #undef HAVE_FSTATVFS */
+
+/* Define to 1 if you have the <gc/gc.h> header file. */
+/* #undef HAVE_GC_GC_H */
+
+/* Define to 1 if you have the <gc.h> header file. */
+#define HAVE_GC_H 1
+
+/* Define to 1 if you have the `getdomainname' function. */
+/* #undef HAVE_GETDOMAINNAME */
+
+/* Define to 1 if you have the `getfsstat' function. */
+/* #undef HAVE_GETFSSTAT */
+
+/* Define to 1 if you have the `getgrgid_r' function. */
+/* #undef HAVE_GETGRGID_R */
+
+/* Define to 1 if you have the `getgrnam_r' function. */
+/* #undef HAVE_GETGRNAM_R */
+
+/* Define to 1 if you have the `GetProcessId' function. */
+/* #undef HAVE_GETPROCESSID */
+
+/* Define to 1 if you have the `getpwnam_r' function. */
+/* #undef HAVE_GETPWNAM_R */
+
+/* Define to 1 if you have the `getpwuid_r' function. */
+/* #undef HAVE_GETPWUID_R */
+
+/* Define to 1 if you have the `getresuid' function. */
+/* #undef HAVE_GETRESUID */
+
+/* Define to 1 if you have the <grp.h> header file. */
+/* #undef HAVE_GRP_H */
+
+/* Define to 1 if you have the <ieeefp.h> header file. */
+/* #undef HAVE_IEEEFP_H */
+
+/* Define to 1 if you have the `inet_aton' function. */
+/* #undef HAVE_INET_ATON */
+
+/* Define to 1 if you have the `inet_pton' function. */
+/* #undef HAVE_INET_PTON */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `isfinite' function. */
+/* #undef HAVE_ISFINITE */
+
+/* isinf available */
+#define HAVE_ISINF 1
+
+/* Define to 1 if you have the `kqueue' function. */
+/* #undef HAVE_KQUEUE */
+
+/* Define to 1 if you have the `unwind' library (-lunwind). */
+/* #undef HAVE_LIBUNWIND */
+
+/* Define to 1 if you have the <linux/rtc.h> header file. */
+/* #undef HAVE_LINUX_RTC_H */
+
+/* Define to 1 if you have the `lutimes' function. */
+/* #undef HAVE_LUTIMES */
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mremap' function. */
+/* #undef HAVE_MREMAP */
+
+/* Define to 1 if you have the <netdb.h> header file. */
+/* #undef HAVE_NETDB_H */
+
+/* Define to 1 if you have the <net/if.h> header file. */
+/* #undef HAVE_NET_IF_H */
+
+/* No GC support. */
+/* #undef HAVE_NULL_GC */
+
+/* Define to 1 if you have the `poll' function. */
+/* #undef HAVE_POLL */
+
+/* Define to 1 if you have the <poll.h> header file. */
+/* #undef HAVE_POLL_H */
+
+/* Define to 1 if you have the `posix_fadvise' function. */
+/* #undef HAVE_POSIX_FADVISE */
+
+/* Define to 1 if you have the `posix_fallocate' function. */
+/* #undef HAVE_POSIX_FALLOCATE */
+
+/* Define to 1 if you have the `posix_madvise' function. */
+/* #undef HAVE_POSIX_MADVISE */
+
+/* Define to 1 if you have the `pthread_attr_getstack' function. */
+/* #undef HAVE_PTHREAD_ATTR_GETSTACK */
+
+/* Define to 1 if you have the `pthread_attr_get_np' function. */
+/* #undef HAVE_PTHREAD_ATTR_GET_NP */
+
+/* Define to 1 if you have the `pthread_attr_setstacksize' function. */
+/* #undef HAVE_PTHREAD_ATTR_SETSTACKSIZE */
+
+/* Define to 1 if you have the `pthread_getattr_np' function. */
+/* #undef HAVE_PTHREAD_GETATTR_NP */
+
+/* Define to 1 if you have the `pthread_get_stackaddr_np' function. */
+/* #undef HAVE_PTHREAD_GET_STACKADDR_NP */
+
+/* Define to 1 if you have the `pthread_get_stacksize_np' function. */
+/* #undef HAVE_PTHREAD_GET_STACKSIZE_NP */
+
+/* Define to 1 if you have the <pthread.h> header file. */
+/* #undef HAVE_PTHREAD_H */
+
+/* Define to 1 if you have the `pthread_mutex_timedlock' function. */
+/* #undef HAVE_PTHREAD_MUTEX_TIMEDLOCK */
+
+/* Define to 1 if you have the `remap_file_pages' function. */
+/* #undef HAVE_REMAP_FILE_PAGES */
+
+/* Define to 1 if you have the <semaphore.h> header file. */
+/* #undef HAVE_SEMAPHORE_H */
+
+/* Define to 1 if you have the `sendfile' function. */
+/* #undef HAVE_SENDFILE */
+
+/* Define to 1 if you have the `setdomainname' function. */
+/* #undef HAVE_SETDOMAINNAME */
+
+/* Define to 1 if you have the `sethostid' function. */
+/* #undef HAVE_SETHOSTID */
+
+/* Define if setkey(3) is available */
+/* #undef HAVE_SETKEY */
+
+/* Define to 1 if you have the `setresuid' function. */
+/* #undef HAVE_SETRESUID */
+
+/* Can get interface list */
+/* #undef HAVE_SIOCGIFCONF */
+
+/* Define to 1 if you have the `statfs' function. */
+/* #undef HAVE_STATFS */
+
+/* Define to 1 if you have the `statvfs' function. */
+/* #undef HAVE_STATVFS */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the `stime' function. */
+/* #undef HAVE_STIME */
+
+/* Define to 1 if you have the `strerror_r' function. */
+/* #undef HAVE_STRERROR_R */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if `d_off' is member of `struct dirent'. */
+/* #undef HAVE_STRUCT_DIRENT_D_OFF */
+
+/* Define to 1 if `d_reclen' is member of `struct dirent'. */
+/* #undef HAVE_STRUCT_DIRENT_D_RECLEN */
+
+/* Define to 1 if `d_type' is member of `struct dirent'. */
+/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
+
+/* Define to 1 if you have the <syslog.h> header file. */
+/* #undef HAVE_SYSLOG_H */
+
+/* Define to 1 if you have the <sys/aio.h> header file. */
+/* #undef HAVE_SYS_AIO_H */
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+/* #undef HAVE_SYS_EPOLL_H */
+
+/* Define to 1 if you have the <sys/extattr.h> header file. */
+/* #undef HAVE_SYS_EXTATTR_H */
+
+/* Define to 1 if you have the <sys/filio.h> header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+/* #undef HAVE_SYS_IOCTL_H */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/poll.h> header file. */
+/* #undef HAVE_SYS_POLL_H */
+
+/* Define to 1 if you have the <sys/sendfile.h> header file. */
+/* #undef HAVE_SYS_SENDFILE_H */
+
+/* Define to 1 if you have the <sys/sockio.h> header file. */
+/* #undef HAVE_SYS_SOCKIO_H */
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+/* #undef HAVE_SYS_STATVFS_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+/* #undef HAVE_SYS_UN_H */
+
+/* Define to 1 if you have the <sys/vfstab.h> header file. */
+/* #undef HAVE_SYS_VFSTAB_H */
+
+/* Define to 1 if you have the <sys/wait.h> header file. */
+/* #undef HAVE_SYS_WAIT_H */
+
+/* Define to 1 if you have the <sys/xattr.h> header file. */
+/* #undef HAVE_SYS_XATTR_H */
+
+/* Define to 1 if you have the <termios.h> header file. */
+/* #undef HAVE_TERMIOS_H */
+
+/* Define to 1 if you have the <term.h> header file. */
+/* #undef HAVE_TERM_H */
+
+/* tld_model available */
+/* #undef HAVE_TLS_MODEL_ATTR */
+
+/* Define to 1 if you have the `trunc' function. */
+#define HAVE_TRUNC 1
+
+/* Define to 1 if you have the `ttyname_r' function. */
+/* #undef HAVE_TTYNAME_R */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
+/* Define to 1 if you have the <valgrind/memcheck.h> header file. */
+/* #undef HAVE_VALGRIND_MEMCHECK_H */
+
+/* Support for the visibility ("hidden") attribute */
+#define HAVE_VISIBILITY_HIDDEN 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+/* #undef HAVE_VSNPRINTF */
+
+/* Define to 1 if you have the <wchar.h> header file. */
+#define HAVE_WCHAR_H 1
+
+/* Architecture uses registers for Parameters */
+/* #undef MONO_ARCH_REGPARMS */
+
+/* The Mono Debugger is supported on this platform */
+/* #undef MONO_DEBUGGER_SUPPORTED */
+
+/* Xen-specific behaviour */
+#define MONO_XEN_OPT 1
+
+/* Define if Unix sockets cannot be created in an anonymous namespace */
+/* #undef NEED_LINK_UNLINK */
+
+/* Name of package */
+#define PACKAGE "mono"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME ""
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING ""
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION ""
+
+/* Platform is Win32 */
+#define PLATFORM_WIN32 1
+
+/* Pointer field name in 'union sigval' */
+/* #undef SIGVAL_PTR */
+
+/* The size of a `size_t', as computed by sizeof. */
+/* #undef SIZEOF_SIZE_T */
+
+/* The size of a `void *', as computed by sizeof. */
+#define SIZEOF_VOID_P 4
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* GC description */
+#define USED_GC_NAME "Included Boehm (with typed GC)"
+
+/* Version number of package */
+#define VERSION "1.2"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
