[svn:parrot] r41025 - in trunk: include/parrot src/gc src/pmc
bacek at svn.parrot.org
bacek at svn.parrot.org
Sun Sep 6 00:20:19 UTC 2009
Author: bacek
Date: Sun Sep 6 00:20:18 2009
New Revision: 41025
URL: https://trac.parrot.org/parrot/changeset/41025
Log:
[cage] Use UINTVAL for n_used_regs.
Modified:
trunk/include/parrot/context.h
trunk/include/parrot/register.h
trunk/src/gc/alloc_register.c
trunk/src/pmc/context.pmc
Modified: trunk/include/parrot/context.h
==============================================================================
--- trunk/include/parrot/context.h Sun Sep 6 00:20:10 2009 (r41024)
+++ trunk/include/parrot/context.h Sun Sep 6 00:20:18 2009 (r41025)
@@ -27,7 +27,7 @@
Regs_ps bp_ps; /* pointers to PMC & STR */
/* end common header */
- INTVAL n_regs_used[4]; /* INSP in PBC points to Sub */
+ UINTVAL n_regs_used[4]; /* INSP in PBC points to Sub */
PMC *lex_pad; /* LexPad PMC */
PMC *outer_ctx; /* outer context, if a closure */
Modified: trunk/include/parrot/register.h
==============================================================================
--- trunk/include/parrot/register.h Sun Sep 6 00:20:10 2009 (r41024)
+++ trunk/include/parrot/register.h Sun Sep 6 00:20:18 2009 (r41025)
@@ -80,7 +80,7 @@
PARROT_CANNOT_RETURN_NULL
FLOATVAL * Parrot_pcc_get_FLOATVAL_reg(PARROT_INTERP,
ARGIN(PMC *ctx),
- INTVAL idx)
+ UINTVAL idx)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -88,13 +88,13 @@
PARROT_CANNOT_RETURN_NULL
INTVAL * Parrot_pcc_get_INTVAL_reg(PARROT_INTERP,
ARGIN(PMC *ctx),
- INTVAL idx)
+ UINTVAL idx)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
-PMC ** Parrot_pcc_get_PMC_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
+PMC ** Parrot_pcc_get_PMC_reg(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL idx)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -111,7 +111,7 @@
__attribute__nonnull__(2);
PARROT_EXPORT
-int Parrot_pcc_get_regs_used(PARROT_INTERP, ARGIN(PMC *ctx), int type)
+UINTVAL Parrot_pcc_get_regs_used(PARROT_INTERP, ARGIN(PMC *ctx), int type)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -119,7 +119,7 @@
PARROT_CANNOT_RETURN_NULL
STRING ** Parrot_pcc_get_STRING_reg(PARROT_INTERP,
ARGIN(PMC *ctx),
- INTVAL idx)
+ UINTVAL idx)
__attribute__nonnull__(1)
__attribute__nonnull__(2);
Modified: trunk/src/gc/alloc_register.c
==============================================================================
--- trunk/src/gc/alloc_register.c Sun Sep 6 00:20:10 2009 (r41024)
+++ trunk/src/gc/alloc_register.c Sun Sep 6 00:20:18 2009 (r41025)
@@ -156,7 +156,7 @@
clear_regs(PARROT_INTERP, ARGMOD(PMC *pmcctx))
{
ASSERT_ARGS(clear_regs)
- int i;
+ UINTVAL i;
Parrot_Context *ctx = Parrot_pcc_get_context_struct(interp, pmcctx);
/* NULL out registers - P/S have to be NULL for GC
@@ -405,7 +405,7 @@
Parrot_clear_i(PARROT_INTERP)
{
ASSERT_ARGS(Parrot_clear_i)
- int i;
+ UINTVAL i;
for (i = 0; i < Parrot_pcc_get_regs_used(interp, CURRENT_CONTEXT(interp), REGNO_INT); ++i)
REG_INT(interp, i) = 0;
}
@@ -426,7 +426,7 @@
Parrot_clear_s(PARROT_INTERP)
{
ASSERT_ARGS(Parrot_clear_s)
- int i;
+ UINTVAL i;
for (i = 0; i < Parrot_pcc_get_regs_used(interp, CURRENT_CONTEXT(interp), REGNO_STR); ++i)
REG_STR(interp, i) = NULL;
}
@@ -447,7 +447,7 @@
Parrot_clear_p(PARROT_INTERP)
{
ASSERT_ARGS(Parrot_clear_p)
- int i;
+ UINTVAL i;
for (i = 0; i < Parrot_pcc_get_regs_used(interp, CURRENT_CONTEXT(interp), REGNO_PMC); ++i)
REG_PMC(interp, i) = PMCNULL;
}
@@ -468,14 +468,15 @@
Parrot_clear_n(PARROT_INTERP)
{
ASSERT_ARGS(Parrot_clear_n)
- int i;
+ UINTVAL i;
for (i = 0; i < Parrot_pcc_get_regs_used(interp, CURRENT_CONTEXT(interp), REGNO_NUM); ++i)
REG_NUM(interp, i) = 0.0;
}
/*
-=item C<INTVAL * Parrot_pcc_get_INTVAL_reg(PARROT_INTERP, PMC *ctx, INTVAL idx)>
+=item C<INTVAL * Parrot_pcc_get_INTVAL_reg(PARROT_INTERP, PMC *ctx, UINTVAL
+idx)>
Get pointer to INTVAL register.
@@ -486,7 +487,7 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
INTVAL *
-Parrot_pcc_get_INTVAL_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
+Parrot_pcc_get_INTVAL_reg(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL idx)
{
ASSERT_ARGS(Parrot_pcc_get_INTVAL_reg)
PARROT_ASSERT(Parrot_pcc_get_regs_used(interp, ctx, REGNO_INT) > idx);
@@ -495,7 +496,7 @@
/*
-=item C<FLOATVAL * Parrot_pcc_get_FLOATVAL_reg(PARROT_INTERP, PMC *ctx, INTVAL
+=item C<FLOATVAL * Parrot_pcc_get_FLOATVAL_reg(PARROT_INTERP, PMC *ctx, UINTVAL
idx)>
Get pointer to FLOATVAL register.
@@ -507,7 +508,7 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
FLOATVAL *
-Parrot_pcc_get_FLOATVAL_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
+Parrot_pcc_get_FLOATVAL_reg(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL idx)
{
ASSERT_ARGS(Parrot_pcc_get_FLOATVAL_reg)
PARROT_ASSERT(Parrot_pcc_get_regs_used(interp, ctx, REGNO_NUM) > idx);
@@ -516,7 +517,7 @@
/*
-=item C<STRING ** Parrot_pcc_get_STRING_reg(PARROT_INTERP, PMC *ctx, INTVAL
+=item C<STRING ** Parrot_pcc_get_STRING_reg(PARROT_INTERP, PMC *ctx, UINTVAL
idx)>
Get pointer to STRING register.
@@ -528,7 +529,7 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
STRING **
-Parrot_pcc_get_STRING_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
+Parrot_pcc_get_STRING_reg(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL idx)
{
ASSERT_ARGS(Parrot_pcc_get_STRING_reg)
PARROT_ASSERT(Parrot_pcc_get_regs_used(interp, ctx, REGNO_STR) > idx);
@@ -537,7 +538,7 @@
/*
-=item C<PMC ** Parrot_pcc_get_PMC_reg(PARROT_INTERP, PMC *ctx, INTVAL idx)>
+=item C<PMC ** Parrot_pcc_get_PMC_reg(PARROT_INTERP, PMC *ctx, UINTVAL idx)>
Get pointer to PMC register.
@@ -548,7 +549,7 @@
PARROT_EXPORT
PARROT_CANNOT_RETURN_NULL
PMC **
-Parrot_pcc_get_PMC_reg(PARROT_INTERP, ARGIN(PMC *ctx), INTVAL idx)
+Parrot_pcc_get_PMC_reg(PARROT_INTERP, ARGIN(PMC *ctx), UINTVAL idx)
{
ASSERT_ARGS(Parrot_pcc_get_PMC_reg)
PARROT_ASSERT(Parrot_pcc_get_regs_used(interp, ctx, REGNO_PMC) > idx);
@@ -557,7 +558,7 @@
/*
-=item C<int Parrot_pcc_get_regs_used(PARROT_INTERP, PMC *ctx, int type)>
+=item C<UINTVAL Parrot_pcc_get_regs_used(PARROT_INTERP, PMC *ctx, int type)>
Return number of used registers of particular type.
@@ -565,7 +566,7 @@
*/
PARROT_EXPORT
-int
+UINTVAL
Parrot_pcc_get_regs_used(PARROT_INTERP, ARGIN(PMC *ctx), int type)
{
ASSERT_ARGS(Parrot_pcc_get_regs_used)
Modified: trunk/src/pmc/context.pmc
==============================================================================
--- trunk/src/pmc/context.pmc Sun Sep 6 00:20:10 2009 (r41024)
+++ trunk/src/pmc/context.pmc Sun Sep 6 00:20:18 2009 (r41025)
@@ -53,8 +53,8 @@
VTABLE void mark()
{
Parrot_Context * const ctx = PMC_data_typed(SELF, Parrot_Context*);
- PObj *obj;
- int i;
+ PObj *obj;
+ UINTVAL i;
/* If Context wasn't initialised just return */
if (!ctx)
More information about the parrot-commits
mailing list