[svn:parrot] r41692 - branches/pcc_reapply/src/call
mikehh at svn.parrot.org
mikehh at svn.parrot.org
Sun Oct 4 14:12:15 UTC 2009
Author: mikehh
Date: Sun Oct 4 14:12:14 2009
New Revision: 41692
URL: https://trac.parrot.org/parrot/changeset/41692
Log:
attempt to fix codetest problems with src/call/args.c - codetest passes
Modified:
branches/pcc_reapply/src/call/args.c
Modified: branches/pcc_reapply/src/call/args.c
==============================================================================
--- branches/pcc_reapply/src/call/args.c Sun Oct 4 14:10:08 2009 (r41691)
+++ branches/pcc_reapply/src/call/args.c Sun Oct 4 14:12:14 2009 (r41692)
@@ -1335,10 +1335,72 @@
VTABLE_push_integer(interp, current_array, flags);
}
+/*
+
+Get the appropriate value from the op
+
+=item C<static INTVAL* intval_from_op(PARROT_INTERP, opcode_t *raw_params,
+INTVAL param_index)>
+
+=item C<static FLOATVAL* numval_from_op(PARROT_INTERP, opcode_t *raw_params,
+INTVAL param_index)>
+
+=item C<static STRING** string_from_op(PARROT_INTERP, opcode_t *raw_params,
+INTVAL param_index)>
+
+=item C<static PMC** pmc_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL
+param_index)>
+
+=item C<static INTVAL intval_constant_from_op(PARROT_INTERP, opcode_t
+*raw_params, INTVAL param_index)>
+
+=item C<static FLOATVAL numval_constant_from_op(PARROT_INTERP, opcode_t
+*raw_params, INTVAL param_index)>
+
+=item C<static STRING* string_constant_from_op(PARROT_INTERP, opcode_t
+*raw_params, INTVAL param_index)>
+
+=item C<static PMC* pmc_constant_from_op(PARROT_INTERP, opcode_t *raw_params,
+INTVAL param_index)>
+
+Get the appropriate value from varargs
+
+=item C<static INTVAL* intval_from_varargs(PARROT_INTERP, va_list *args, INTVAL
+param_index)>
+
+=item C<static FLOATVAL* numval_from_varargs(PARROT_INTERP, va_list *args,
+INTVAL param_index)>
+
+=item C<static STRING** string_from_varargs(PARROT_INTERP, va_list *args, INTVAL
+param_index)>
+
+=item C<static PMC** pmc_from_varargs(PARROT_INTERP, va_list *args, INTVAL
+param_index)>
+
+The constants from varargs are a Wrong Call
+
+=item C<static INTVAL intval_constant_from_varargs(PARROT_INTERP, void *data,
+INTVAL index)>
+
+=item C<static FLOATVAL numval_constant_from_varargs(PARROT_INTERP, void *data,
+INTVAL index)>
+
+=item C<static STRING* string_constant_from_varargs(PARROT_INTERP, void *data,
+INTVAL index)>
+
+=item C<static PMC* pmc_constant_from_varargs(PARROT_INTERP, void* data, INTVAL
+index)>
+
+ - More specific comments can be added later
+
+=cut
+
+*/
static INTVAL*
intval_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(intval_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return ®_INT(interp, raw_index);
}
@@ -1346,6 +1408,7 @@
static FLOATVAL*
numval_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(numval_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return ®_NUM(interp, raw_index);
}
@@ -1353,6 +1416,7 @@
static STRING**
string_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(string_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return ®_STR(interp, raw_index);
}
@@ -1360,6 +1424,7 @@
static PMC**
pmc_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(pmc_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return ®_PMC(interp, raw_index);
}
@@ -1367,6 +1432,7 @@
static INTVAL
intval_constant_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(intval_constant_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return Parrot_pcc_get_int_constant(interp, CURRENT_CONTEXT(interp), raw_index);
}
@@ -1374,6 +1440,7 @@
static FLOATVAL
numval_constant_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(numval_constant_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return Parrot_pcc_get_num_constant(interp, CURRENT_CONTEXT(interp), raw_index);
}
@@ -1381,6 +1448,7 @@
static STRING*
string_constant_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(string_constant_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return Parrot_pcc_get_string_constant(interp, CURRENT_CONTEXT(interp), raw_index);
}
@@ -1388,6 +1456,7 @@
static PMC*
pmc_constant_from_op(PARROT_INTERP, opcode_t *raw_params, INTVAL param_index)
{
+ ASSERT_ARGS(pmc_constant_from_op)
const INTVAL raw_index = raw_params[param_index + 2];
return Parrot_pcc_get_pmc_constant(interp, CURRENT_CONTEXT(interp), raw_index);
}
@@ -1397,30 +1466,35 @@
static INTVAL*
intval_from_varargs(PARROT_INTERP, va_list *args, SHIM(INTVAL param_index))
{
+ ASSERT_ARGS(intval_from_varargs)
return va_arg(*args, INTVAL*);
}
static FLOATVAL*
numval_from_varargs(PARROT_INTERP, va_list *args, SHIM(INTVAL param_index))
{
+ ASSERT_ARGS(numval_from_varargs)
return va_arg(*args, FLOATVAL*);
}
static STRING**
string_from_varargs(PARROT_INTERP, va_list *args, SHIM(INTVAL param_index))
{
+ ASSERT_ARGS(string_from_varargs)
return va_arg(*args, STRING**);
}
static PMC**
pmc_from_varargs(PARROT_INTERP, va_list *args, SHIM(INTVAL param_index))
{
+ ASSERT_ARGS(pmc_from_varargs)
return va_arg(*args, PMC**);
}
static INTVAL
intval_constant_from_varargs(PARROT_INTERP, void *data, INTVAL index)
{
+ ASSERT_ARGS(intval_constant_from_varargs)
PARROT_ASSERT(!"Wrong call");
return 0;
}
@@ -1428,6 +1502,7 @@
static FLOATVAL
numval_constant_from_varargs(PARROT_INTERP, void *data, INTVAL index)
{
+ ASSERT_ARGS(numval_constant_from_varargs)
PARROT_ASSERT(!"Wrong call");
return 0.0;
}
@@ -1435,6 +1510,7 @@
static STRING*
string_constant_from_varargs(PARROT_INTERP, void *data, INTVAL index)
{
+ ASSERT_ARGS(string_constant_from_varargs)
PARROT_ASSERT(!"Wrong call");
return NULL;
}
@@ -1442,6 +1518,7 @@
static PMC*
pmc_constant_from_varargs(PARROT_INTERP, void* data, INTVAL index)
{
+ ASSERT_ARGS(pmc_constant_from_varargs)
PARROT_ASSERT(!"Wrong call");
return PMCNULL;
}
More information about the parrot-commits
mailing list