[svn:parrot] r41667 - branches/pcc_reapply/src
bacek at svn.parrot.org
bacek at svn.parrot.org
Sun Oct 4 02:08:59 UTC 2009
Author: bacek
Date: Sun Oct 4 02:08:58 2009
New Revision: 41667
URL: https://trac.parrot.org/parrot/changeset/41667
Log:
Remove more old param passing stuff from frame_builder.
Modified:
branches/pcc_reapply/src/frame_builder.c
Modified: branches/pcc_reapply/src/frame_builder.c
==============================================================================
--- branches/pcc_reapply/src/frame_builder.c Sun Oct 4 02:08:42 2009 (r41666)
+++ branches/pcc_reapply/src/frame_builder.c Sun Oct 4 02:08:58 2009 (r41667)
@@ -100,82 +100,6 @@
return rv;
}
-INTVAL
-get_nci_I(PARROT_INTERP, ARGMOD(call_state *st), int n)
-{
- if (n >= st->src.n)
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
- "too few arguments passed to NCI function");
-
- Parrot_fetch_arg_nci(interp, st);
-
- return UVal_int(st->val);
-}
-
-FLOATVAL
-get_nci_N(PARROT_INTERP, ARGMOD(call_state *st), int n)
-{
- if (n >= st->src.n)
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
- "too few arguments passed to NCI function");
-
- Parrot_fetch_arg_nci(interp, st);
-
- return UVal_num(st->val);
-}
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CANNOT_RETURN_NULL
-STRING*
-get_nci_S(PARROT_INTERP, ARGMOD(call_state *st), int n)
-{
- /* TODO or act like below? */
- if (n >= st->src.n)
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
- "too few arguments passed to NCI function");
-
- Parrot_fetch_arg_nci(interp, st);
-
- return UVal_str(st->val);
-}
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-PMC*
-get_nci_P(PARROT_INTERP, ARGMOD(call_state *st), int n)
-{
- /*
- * excessive args are passed as NULL
- * used by e.g. MMD infix like __add
- */
- if (n < st->src.n) {
- PMC *value;
- Parrot_fetch_arg_nci(interp, st);
- value = UVal_pmc(st->val);
- return PMC_IS_NULL(value) ? (PMC *)NULL : value;
- }
- else
- return NULL;
-}
-
-PARROT_WARN_UNUSED_RESULT
-PARROT_CAN_RETURN_NULL
-void*
-get_nci_p(PARROT_INTERP, ARGMOD(call_state *st), int n)
-{
- /*
- * excessive args are passed as NULL
- * used by e.g. MMD infix like __add
- */
- if (n < st->src.n) {
- PMC *value;
- Parrot_fetch_arg_nci(interp, st);
- value = UVal_pmc(st->val);
- return PMC_IS_NULL(value) ? (PMC *)NULL : VTABLE_get_pointer(interp, value);
- }
- else
- return NULL;
-}
int
emit_is8bit(long disp)
@@ -427,23 +351,23 @@
emitm_movl_m_r(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 'f':
- emitm_call_cfunc(pc, get_nci_N);
+ /* FIXME emitm_call_cfunc(pc, get_nci_N); */
emitm_fstps(interp, pc, emit_EBP, 0, 1, args_offset);
break;
case 'N':
case 'd':
- emitm_call_cfunc(pc, get_nci_N);
+ /* FIXME emitm_call_cfunc(pc, get_nci_N); */
emitm_fstpl(interp, pc, emit_EBP, 0, 1, args_offset);
args_offset += 4;
break;
case 'I': /* INTVAL */
case 'l': /* long */
case 'i': /* int */
- emitm_call_cfunc(pc, get_nci_I);
+ /* FIXME emitm_call_cfunc(pc, get_nci_I); */
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 't': /* string, pass a cstring */
- emitm_call_cfunc(pc, get_nci_S);
+ /* FIXME emitm_call_cfunc(pc, get_nci_S); */
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, temp_calls_offset + 4);
emitm_call_cfunc(pc, string_to_cstring_nullable);
@@ -457,12 +381,12 @@
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, temp_calls_offset + 4);
break;
case 's': /* short: movswl intreg_o(base), %eax */
- emitm_call_cfunc(pc, get_nci_I);
+ /* FIXME emitm_call_cfunc(pc, get_nci_I); */
emitm_movswl_r_r(pc, emit_EAX, emit_EAX);
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 'c': /* char: movsbl intreg_o(base), %eax */
- emitm_call_cfunc(pc, get_nci_I);
+ /* emitm_call_cfunc(pc, get_nci_I); */
emitm_movsbl_r_r(pc, emit_EAX, emit_EAX);
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
@@ -472,31 +396,31 @@
arg_count--;
break;
case 'p': /* push pmc->data */
- emitm_call_cfunc(pc, get_nci_p);
+ /* FIXME emitm_call_cfunc(pc, get_nci_p); */
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 'O': /* push PMC * object in P2 */
case 'P': /* push PMC * */
case '@':
- emitm_call_cfunc(pc, get_nci_P);
+ /* FIXME emitm_call_cfunc(pc, get_nci_P); */
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 'v':
break;
case 'b': /* buffer (void*) pass Buffer_bufstart(SReg) */
- emitm_call_cfunc(pc, get_nci_S);
+ /* FIXME emitm_call_cfunc(pc, get_nci_S); */
emitm_movl_m_r(interp, pc, emit_EAX, emit_EAX, 0, 1,
(size_t) &Buffer_bufstart((STRING *) NULL));
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 'B': /* buffer (void**) pass &Buffer_bufstart(SReg) */
- emitm_call_cfunc(pc, get_nci_S);
+ /* FIXME emitm_call_cfunc(pc, get_nci_S); */
emitm_lea_m_r(interp, pc, emit_EAX, emit_EAX, 0, 1,
(size_t) &Buffer_bufstart((STRING *) NULL));
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
case 'S':
- emitm_call_cfunc(pc, get_nci_S);
+ /* FIXME emitm_call_cfunc(pc, get_nci_S); */
emitm_movl_r_m(interp, pc, emit_EAX, emit_EBP, 0, 1, args_offset);
break;
More information about the parrot-commits
mailing list