Author: chromatic
Date: Fri Apr 13 21:50:42 2007
New Revision: 18186
Modified:
trunk/include/parrot/inter_call.h
trunk/src/inter_call.c
trunk/tools/build/nativecall.pl
Log:
Added typedefs to call_state* structs in include/parrot/inter_call.h.
Removed "struct" from all places that use these types. This removes a bit of
code from the generated NCI file, which is why I did it.
Modified: trunk/include/parrot/inter_call.h
==============================================================================
--- trunk/include/parrot/inter_call.h (original)
+++ trunk/include/parrot/inter_call.h Fri Apr 13 21:50:42 2007
@@ -72,7 +72,7 @@
#define CALL_STATE_FLATTEN_UNSET(o) (CALL_STATE_X_UNSET(o, FLATTEN))
#define CALL_STATE_NEXT_ARG_UNSET(o) (CALL_STATE_X_UNSET(o, NEXT_ARG))
-struct call_state_item {
+typedef struct call_state_item {
int mode; /* from_sig, from_set_ops, flatten ...*/
union {
struct {
@@ -91,11 +91,11 @@
PMC *slurp;
INTVAL slurp_i;
INTVAL slurp_n;
-};
+} call_state_item;
-struct call_state {
- struct call_state_item src;
- struct call_state_item dest;
+typedef struct call_state {
+ call_state_item src;
+ call_state_item dest;
UnionVal val;
int n_actual_args; /* arguments incl. flatten */
int optionals; /* sum of optionals */
@@ -104,7 +104,7 @@
UINTVAL named_done; /* bit mask, 1 if named was assigned */
STRING *name; /* name of argument if any */
PMC *key; /* to iterate a flattening hash */
-};
+} call_state;
typedef enum arg_pass_t {
PARROT_PASS_PARAMS = 0x00,
@@ -112,24 +112,24 @@
} arg_pass_t;
PARROT_API int Parrot_init_arg_indexes_and_sig_pmc(Interp *interp,
parrot_context_t *ctx,
- opcode_t *indexes, PMC* sig_pmc, struct call_state_item *st);
+ opcode_t *indexes, PMC* sig_pmc, call_state_item *st);
PARROT_API int Parrot_init_arg_sig(Interp *, parrot_context_t *ctx,
- const char *sig, void *ap, struct call_state_item *st);
+ const char *sig, void *ap, call_state_item *st);
PARROT_API int Parrot_init_arg_op(Interp *, parrot_context_t *ctx,
- opcode_t *pc, struct call_state_item *st);
+ opcode_t *pc, call_state_item *st);
-PARROT_API void Parrot_process_args(Interp *interp, struct call_state *st,
+PARROT_API void Parrot_process_args(Interp *interp, call_state *st,
arg_pass_t param_or_result);
-PARROT_API int Parrot_init_arg_nci(Interp *, struct call_state *st, const char
*sig);
-PARROT_API int Parrot_init_ret_nci(Interp *, struct call_state *st, const char
*sig);
+PARROT_API int Parrot_init_arg_nci(Interp *, call_state *st, const char *sig);
+PARROT_API int Parrot_init_ret_nci(Interp *, call_state *st, const char *sig);
-PARROT_API int Parrot_fetch_arg(Interp *, struct call_state *st);
-PARROT_API int Parrot_fetch_arg_nci(Interp *, struct call_state *st);
-PARROT_API void Parrot_convert_arg(Interp *, struct call_state *st);
-PARROT_API int Parrot_store_arg(Interp *, struct call_state *st);
+PARROT_API int Parrot_fetch_arg(Interp *, call_state *st);
+PARROT_API int Parrot_fetch_arg_nci(Interp *, call_state *st);
+PARROT_API void Parrot_convert_arg(Interp *, call_state *st);
+PARROT_API int Parrot_store_arg(Interp *, call_state *st);
PARROT_API void parrot_pass_args(Interp *, parrot_context_t *src_ctx,
parrot_context_t *dest_ctx, opcode_t *src_indexes, opcode_t
*dest_indexes,
Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c (original)
+++ trunk/src/inter_call.c Fri Apr 13 21:50:42 2007
@@ -37,18 +37,18 @@
orig.bp_ps = save.bp_ps;
-static int next_arg(Interp *, struct call_state_item *st);
-static void next_arg_sig(Interp *interp, struct call_state_item *st);
-static int set_retval_util(Parrot_Interp interp, const char *sig,
parrot_context_t *ctx,
- struct call_state *st);
+static int next_arg(Interp *, call_state_item *st);
+static void next_arg_sig(Interp *interp, call_state_item *st);
+static int set_retval_util(Parrot_Interp interp, const char *sig,
+ parrot_context_t *ctx, call_state *st);
/*
-=item C<int Parrot_init_arg_nci(Interp *, struct call_state *st, const char
*sig)>
+=item C<int Parrot_init_arg_nci(Interp *, call_state *st, const char *sig)>
Initialize the argument passing state C<call_state> for the given NCI
signature.
-=item C<int Parrot_init_ret_nci(Interp *, struct call_state *st, const char
*sig)>
+=item C<int Parrot_init_ret_nci(Interp *, call_state *st, const char *sig)>
Initialize the return value passing state C<call_state> for the given NCI
signature.
@@ -57,7 +57,7 @@
*/
int
-Parrot_init_arg_nci(Interp *interp, struct call_state *st, const char *sig)
+Parrot_init_arg_nci(Interp *interp, call_state *st, const char *sig)
{
if (PMC_IS_NULL(interp->args_signature))
Parrot_init_arg_op(interp, CONTEXT(interp->ctx), interp->current_args,
&st->src);
@@ -69,7 +69,7 @@
}
int
-Parrot_init_ret_nci(Interp *interp, struct call_state *st, const char *sig)
+Parrot_init_ret_nci(Interp *interp, call_state *st, const char *sig)
{
struct Parrot_Context *ctx = CONTEXT(interp->ctx);
PMC *current_cont = ctx->current_cont;
@@ -89,20 +89,20 @@
/*
int
-=item C<Parrot_init_arg_indexes_and_sig_pmc(Interp *interp, parrot_context_t
*ctx,
- opcode_t *indexes, PMC* sig_pmc, struct call_state_item *st)>
+=item C<Parrot_init_arg_indexes_and_sig_pmc(Interp *interp,
+ parrot_context_t *ctx, opcode_t *indexes, PMC* sig_pmc, call_state_item
*st)>
Initialize argument transfer with given context registers, register indexes,
and
a signature pmc.
=item C<int Parrot_init_arg_sig(Interp *, parrot_context_t *ctx,
- const char *sig, void *ap, struct call_state_item *st)>
+ const char *sig, void *ap, call_state_item *st)>
Initialize argument transfer with given code segment (holding the
const_table), registers, function signature, and arguments.
-=item C<int Parrot_init_arg_op(Interp *, parrot_context_t *ctx,
- opcode_t *pc, struct call_state_item *st)>
+=item C<int Parrot_init_arg_op(Interp *, parrot_context_t *ctx, opcode_t *pc,
+ call_state_item *st)>
Initialize argument transfer with given context registers, and opcode
location of a get_ or set_ argument opcode.
@@ -118,7 +118,7 @@
int
Parrot_init_arg_indexes_and_sig_pmc(Interp *interp, parrot_context_t *ctx,
- opcode_t *indexes, PMC* sig_pmc, struct call_state_item *st)
+ opcode_t *indexes, PMC* sig_pmc, call_state_item *st)
{
if (!sig_pmc && indexes) {
++indexes;
@@ -147,8 +147,8 @@
}
int
-Parrot_init_arg_op(Interp *interp, parrot_context_t *ctx,
- opcode_t *pc, struct call_state_item *st)
+Parrot_init_arg_op(Interp *interp, parrot_context_t *ctx, opcode_t *pc,
+ call_state_item *st)
{
PMC *sig_pmc = PMCNULL;
if (pc) {
@@ -161,8 +161,8 @@
}
int
-Parrot_init_arg_sig(Interp *interp, parrot_context_t *ctx,
- const char *sig, void *ap, struct call_state_item *st)
+Parrot_init_arg_sig(Interp *interp, parrot_context_t *ctx, const char *sig,
+ void *ap, call_state_item *st)
{
st->i = 0;
st->n = 0;
@@ -185,7 +185,7 @@
* PMC being flattened, and fetch the first arg from the flattened set.
*/
static void
-start_flatten(Interp *interp, struct call_state *st, PMC *p_arg)
+start_flatten(Interp *interp, call_state *st, PMC *p_arg)
{
if (PARROT_ARG_NAME_ISSET(st->src.sig)) {
/* src ought to be an hash */
@@ -216,7 +216,7 @@
static void
-next_arg_sig(Interp *interp, struct call_state_item *st)
+next_arg_sig(Interp *interp, call_state_item *st)
{
switch (st->mode & CALL_S_D_MASK) {
case CALL_STATE_OP:
@@ -243,7 +243,7 @@
}
static int
-next_arg(Interp *interp, struct call_state_item *st)
+next_arg(Interp *interp, call_state_item *st)
{
st->i++;
if (st->i >= st->n) {
@@ -256,7 +256,7 @@
}
static void
-fetch_arg_sig(Interp *interp, struct call_state *st)
+fetch_arg_sig(Interp *interp, call_state *st)
{
va_list *ap = (va_list*)(st->src.u.sig.ap);
switch (st->src.sig & PARROT_ARG_TYPE_MASK) {
@@ -286,7 +286,7 @@
static void
-fetch_arg_op(Interp *interp, struct call_state *st)
+fetch_arg_op(Interp *interp, call_state *st)
{
int constant = PARROT_ARG_CONSTANT_ISSET(st->src.sig);
INTVAL idx = st->src.u.op.pc[st->src.i];
@@ -318,7 +318,7 @@
int
-Parrot_fetch_arg(Interp *interp, struct call_state *st)
+Parrot_fetch_arg(Interp *interp, call_state *st)
{
if (st->dest.mode & CALL_STATE_NEXT_ARG) {
if (!next_arg(interp, &st->dest))
@@ -390,7 +390,7 @@
int
-Parrot_fetch_arg_nci(Interp *interp, struct call_state *st)
+Parrot_fetch_arg_nci(Interp *interp, call_state *st)
{
Parrot_fetch_arg(interp, st);
if (st->dest.sig & PARROT_ARG_SLURPY_ARRAY) {
@@ -413,7 +413,7 @@
}
static void
-convert_arg_from_int(Interp *interp, struct call_state *st)
+convert_arg_from_int(Interp *interp, call_state *st)
{
PMC *d;
@@ -433,7 +433,7 @@
}
static void
-convert_arg_from_num(Interp *interp, struct call_state *st)
+convert_arg_from_num(Interp *interp, call_state *st)
{
PMC *d;
@@ -453,7 +453,7 @@
}
static void
-convert_arg_from_str(Interp *interp, struct call_state *st)
+convert_arg_from_str(Interp *interp, call_state *st)
{
PMC *d;
@@ -473,7 +473,7 @@
}
static void
-convert_arg_from_pmc(Interp *interp, struct call_state *st)
+convert_arg_from_pmc(Interp *interp, call_state *st)
{
switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
case PARROT_ARG_INTVAL:
@@ -494,7 +494,7 @@
* to pass a key to a tailcalled function or method
*/
static void
-clone_key_arg(Interp *interp, struct call_state *st)
+clone_key_arg(Interp *interp, call_state *st)
{
PMC *key = UVal_pmc(st->val);
@@ -518,7 +518,7 @@
* initializes dest calling state for recption of first named arg.
*/
static void
-init_first_dest_named(Interp *interp, struct call_state *st)
+init_first_dest_named(Interp *interp, call_state *st)
{
int i, n_named, idx;
INTVAL sig;
@@ -569,7 +569,7 @@
* locate destination pos, return 0 if state changed
*/
static int
-locate_pos_named(Interp *interp, struct call_state *st)
+locate_pos_named(Interp *interp, call_state *st)
{
int i, n_named;
INTVAL sig;
@@ -600,7 +600,7 @@
* locate destination name, return 0 if not found
*/
static int
-locate_named_named(Interp *interp, struct call_state *st)
+locate_named_named(Interp *interp, call_state *st)
{
int i, n_named, idx;
INTVAL sig;
@@ -638,7 +638,7 @@
}
static void
-store_arg(struct call_state *st, INTVAL idx)
+store_arg(call_state *st, INTVAL idx)
{
switch (st->dest.sig & PARROT_ARG_TYPE_MASK) {
case PARROT_ARG_INTVAL:
@@ -657,7 +657,7 @@
}
static int
-store_current_arg(Interp *interp, struct call_state *st)
+store_current_arg(Interp *interp, call_state *st)
{
INTVAL idx;
if (st->dest.i >= st->dest.n)
@@ -672,7 +672,7 @@
}
int
-Parrot_store_arg(Interp *interp, struct call_state *st)
+Parrot_store_arg(Interp *interp, call_state *st)
{
if (!store_current_arg(interp, st))
return 0;
@@ -684,7 +684,7 @@
static void
-create_slurpy_array(Interp *interp, struct call_state *st, INTVAL idx)
+create_slurpy_array(Interp *interp, call_state *st, INTVAL idx)
{
st->dest.slurp =
pmc_new(interp, Parrot_get_ctx_HLL_type(interp,
enum_class_ResizablePMCArray));
@@ -699,7 +699,7 @@
}
static void
-too_few(Interp *interp, struct call_state *st, const char *action)
+too_few(Interp *interp, call_state *st, const char *action)
{
int max_expected_args = st->params;
int min_expected_args = max_expected_args - st->optionals;
@@ -713,7 +713,7 @@
}
static void
-too_many(Interp *interp, struct call_state *st, const char *action)
+too_many(Interp *interp, call_state *st, const char *action)
{
int max_expected_args = st->params;
int min_expected_args = max_expected_args - st->optionals;
@@ -727,7 +727,7 @@
}
static void
-null_val(int sig, struct call_state *st)
+null_val(int sig, call_state *st)
{
switch (sig & PARROT_ARG_TYPE_MASK) {
case PARROT_ARG_INTVAL:
@@ -749,7 +749,7 @@
* STRING* name, [INPS] actual_arg, int opt_arg_flag
*/
static void
-check_named(Interp *interp, struct call_state *st, const char *action)
+check_named(Interp *interp, call_state *st, const char *action)
{
int i;
int n_named = -1;
@@ -812,18 +812,18 @@
}
static void
-init_call_stats(struct call_state *st)
+init_call_stats(call_state *st)
{
st->n_actual_args = st->src.n; /* initial guess, adjusted for :flat args
*/
- st->optionals = 0;
- st->params = st->dest.n;
- st->name = NULL;
- st->key = NULL;
- st->first_named = -1;
+ st->optionals = 0;
+ st->params = st->dest.n;
+ st->name = NULL;
+ st->key = NULL;
+ st->first_named = -1;
}
void
-Parrot_process_args(Interp *interp, struct call_state *st, arg_pass_t
param_or_result)
+Parrot_process_args(Interp *interp, call_state *st, arg_pass_t param_or_result)
{
int state, opt_flag;
int err_check = 1;
@@ -1013,7 +1013,7 @@
}
void
-Parrot_convert_arg(Interp *interp, struct call_state *st)
+Parrot_convert_arg(Interp *interp, call_state *st)
{
#define END_OF_ARGS(x) (x.i >= x.n)
/* if END OF SRC or DEST ARGS, no need to convert */
@@ -1073,7 +1073,7 @@
parrot_pass_args(Interp *interp, parrot_context_t *src_ctx, parrot_context_t
*dest_ctx,
opcode_t *src_indexes, opcode_t *dest_indexes, arg_pass_t
param_or_result)
{
- struct call_state st;
+ call_state st;
PMC* src_signature;
PMC* dest_signature;
@@ -1114,7 +1114,7 @@
parrot_pass_args_fromc(Interp *interp, const char *sig,
opcode_t *dest, parrot_context_t *old_ctxp, va_list ap)
{
- struct call_state st;
+ call_state st;
Parrot_init_arg_op(interp, CONTEXT(interp->ctx), dest, &st.dest);
Parrot_init_arg_sig(interp, old_ctxp, sig, PARROT_VA_TO_VAPTR(ap),
&st.src);
@@ -1124,7 +1124,7 @@
int
set_retval_util(Parrot_Interp interp, const char *sig, parrot_context_t *ctx,
- struct call_state *st)
+ call_state *st)
{
opcode_t *src_pc = interp->current_returns;
int todo = Parrot_init_arg_op(interp, ctx, src_pc, &st->src);
@@ -1148,7 +1148,7 @@
void*
set_retval(Parrot_Interp interp, int sig_ret, parrot_context_t *ctx)
{
- struct call_state st;
+ call_state st;
if (!sig_ret || sig_ret == 'v')
return NULL;
@@ -1170,7 +1170,7 @@
INTVAL
set_retval_i(Parrot_Interp interp, int sig_ret, parrot_context_t *ctx)
{
- struct call_state st;
+ call_state st;
if (sig_ret != 'I')
real_exception(interp, NULL, E_ValueError, "return signature not 'I'");
@@ -1187,7 +1187,7 @@
FLOATVAL
set_retval_f(Parrot_Interp interp, int sig_ret, parrot_context_t *ctx)
{
- struct call_state st;
+ call_state st;
if (sig_ret != 'N')
real_exception(interp, NULL, E_ValueError, "return signature not 'N'");
@@ -1204,7 +1204,7 @@
STRING*
set_retval_s(Parrot_Interp interp, int sig_ret, parrot_context_t *ctx)
{
- struct call_state st;
+ call_state st;
if (sig_ret != 'S')
real_exception(interp, NULL, E_ValueError, "return signature not 'S'");
@@ -1221,7 +1221,7 @@
PMC*
set_retval_p(Parrot_Interp interp, int sig_ret, parrot_context_t *ctx)
{
- struct call_state st;
+ call_state st;
if (sig_ret != 'P')
real_exception(interp, NULL, E_ValueError, "return signature not 'P'");
Modified: trunk/tools/build/nativecall.pl
==============================================================================
--- trunk/tools/build/nativecall.pl (original)
+++ trunk/tools/build/nativecall.pl Fri Apr 13 21:50:42 2007
@@ -307,7 +307,7 @@
* helper funcs - get argument n
*/
static INTVAL
-get_nci_I(Interp *interp, struct call_state *st, int n)
+get_nci_I(Interp *interp, call_state *st, int n)
{
if (n >= st->src.n) {
real_exception(interp, NULL, E_ValueError,
@@ -319,7 +319,7 @@
}
static FLOATVAL
-get_nci_N(Interp *interp, struct call_state *st, int n)
+get_nci_N(Interp *interp, call_state *st, int n)
{
if (n >= st->src.n) {
real_exception(interp, NULL, E_ValueError,
@@ -331,9 +331,9 @@
}
static STRING*
-get_nci_S(Interp *interp, struct call_state *st, int n)
+get_nci_S(Interp *interp, call_state *st, int n)
{
- /* TODO or act like below? */
+ /* TODO or act like below? */
if (n >= st->src.n) {
real_exception(interp, NULL, E_ValueError,
"too few arguments passed to NCI function");
@@ -344,7 +344,7 @@
}
static PMC*
-get_nci_P(Interp *interp, struct call_state *st, int n)
+get_nci_P(Interp *interp, call_state *st, int n)
{
/*
* exessive args are passed as NULL
@@ -367,7 +367,7 @@
* set return value
*/
static void
-set_nci_I(Interp *interp, struct call_state *st, INTVAL val)
+set_nci_I(Interp *interp, call_state *st, INTVAL val)
{
Parrot_init_ret_nci(interp, st, "I");
UVal_int(st->val) = val;
@@ -376,7 +376,7 @@
}
static void
-set_nci_N(Interp *interp, struct call_state *st, FLOATVAL val)
+set_nci_N(Interp *interp, call_state *st, FLOATVAL val)
{
Parrot_init_ret_nci(interp, st, "N");
UVal_num(st->val) = val;
@@ -385,7 +385,7 @@
}
static void
-set_nci_S(Interp *interp, struct call_state *st, STRING *val)
+set_nci_S(Interp *interp, call_state *st, STRING *val)
{
Parrot_init_ret_nci(interp, st, "S");
UVal_str(st->val) = val;
@@ -394,7 +394,7 @@
}
static void
-set_nci_P(Interp *interp, struct call_state *st, PMC* val)
+set_nci_P(Interp *interp, call_state *st, PMC* val)
{
Parrot_init_ret_nci(interp, st, "P");
UVal_pmc(st->val) = val;
@@ -524,7 +524,7 @@
$other_decl ||= "";
$other_decl .= join( "\n ", @{$temps_ref} );
- my $call_state = 'struct call_state st;';
+ my $call_state = 'call_state st;';
my $extra_preamble = join( "\n ", @{$extra_preamble_ref} );
my $extra_postamble = join( "\n ", @{$extra_postamble_ref} );
my $return_data =
