Author: jkeenan
Date: Fri Jan 2 20:32:24 2009
New Revision: 34848
Modified:
branches/assert_args/compilers/imcc/debug.c
branches/assert_args/compilers/imcc/imcc.y
branches/assert_args/src/oo.c
Log:
Add ASSERT_ARGS() to each function.
Modified: branches/assert_args/compilers/imcc/debug.c
==============================================================================
--- branches/assert_args/compilers/imcc/debug.c (original)
+++ branches/assert_args/compilers/imcc/debug.c Fri Jan 2 20:32:24 2009
@@ -45,6 +45,7 @@
IMCC_fatal(PARROT_INTERP, SHIM(int code), ARGIN(const char *fmt), ...)
{
va_list ap;
+ ASSERT_ARGS(IMCC_fatal);
va_start(ap, fmt);
IMCC_INFO(interp)->error_message = Parrot_vsprintf_c(interp, fmt, ap);
@@ -68,6 +69,7 @@
IMCC_fataly(PARROT_INTERP, SHIM(int code), ARGIN(const char *fmt), ...)
{
va_list ap;
+ ASSERT_ARGS(IMCC_fataly);
va_start(ap, fmt);
IMCC_INFO(interp)->error_message = Parrot_vsprintf_c(interp, fmt, ap);
@@ -92,6 +94,7 @@
IMCC_fatal_standalone(PARROT_INTERP, int code, ARGIN(const char *fmt), ...)
{
va_list ap;
+ ASSERT_ARGS(IMCC_fatal_standalone);
va_start(ap, fmt);
imcc_vfprintf(interp, Parrot_io_STDERR(interp), fmt, ap);
@@ -117,6 +120,7 @@
{
va_list ap;
+ ASSERT_ARGS(IMCC_fataly_standalone);
va_start(ap, fmt);
fprintf(stderr, "error:imcc:");
@@ -142,6 +146,7 @@
IMCC_warning(PARROT_INTERP, ARGIN(const char *fmt), ...)
{
va_list ap;
+ ASSERT_ARGS(IMCC_warning);
if (IMCC_INFO(interp)->imcc_warn)
return;
@@ -166,6 +171,7 @@
IMCC_info(PARROT_INTERP, int level, ARGIN(const char *fmt), ...)
{
va_list ap;
+ ASSERT_ARGS(IMCC_info);
if (level > IMCC_INFO(interp)->verbose)
return;
@@ -190,6 +196,7 @@
IMCC_debug(PARROT_INTERP, int level, ARGIN(const char *fmt), ...)
{
va_list ap;
+ ASSERT_ARGS(IMCC_debug);
if (!(level & IMCC_INFO(interp)->debug))
return;
@@ -213,6 +220,7 @@
{
const Instruction *ins;
int pc;
+ ASSERT_ARGS(dump_instructions);
Parrot_io_fprintf(interp, Parrot_io_STDERR(interp),
"\nDumping the instructions status:"
@@ -257,6 +265,7 @@
{
unsigned int i;
Edge *e;
+ ASSERT_ARGS(dump_cfg);
fprintf(stderr, "\nDumping the CFG:\n-------------------------------\n");
for (i = 0; i < unit->n_basic_blocks; i++) {
@@ -296,6 +305,7 @@
{
int i;
Loop_info ** loop_info = unit->loop_info;
+ ASSERT_ARGS(dump_loops);
fprintf(stderr, "Loop info\n---------\n");
for (i = 0; i < unit->n_loops; i++) {
@@ -342,6 +352,7 @@
{
const SymHash * const hsh = &unit->hash;
unsigned int i;
+ ASSERT_ARGS(dump_labels);
fprintf(stderr, "Labels\n");
fprintf(stderr, "name\tpos\tlast ref\n"
@@ -375,6 +386,7 @@
{
unsigned int i;
SymReg ** const reglist = unit->reglist;
+ ASSERT_ARGS(dump_symreg);
if (!reglist)
return;
@@ -423,6 +435,7 @@
{
unsigned int i;
SymReg ** const reglist = unit->reglist;
+ ASSERT_ARGS(dump_liveness_status);
fprintf(stderr, "\nSymbols:\n--------------------------------------\n");
@@ -449,6 +462,7 @@
void
dump_liveness_status_var(ARGIN(const IMC_Unit *unit), ARGIN(const SymReg* r))
{
+ ASSERT_ARGS(dump_liveness_status_var);
fprintf(stderr, "\nSymbol %s:", r->name);
if (r->life_info) {
unsigned int i;
@@ -500,6 +514,7 @@
int x;
SymReg** const reglist = unit->reglist;
const int n_symbols = unit->n_symbols;
+ ASSERT_ARGS(dump_interference_graph);
fprintf(stderr, "\nDumping the Interf. graph:"
"\n-------------------------------\n");
@@ -537,6 +552,7 @@
dump_dominators(ARGIN(const IMC_Unit *unit))
{
unsigned int i;
+ ASSERT_ARGS(dump_dominators);
fprintf(stderr, "\nDumping the Dominators Tree:"
"\n-------------------------------\n");
@@ -571,6 +587,7 @@
dump_dominance_frontiers(ARGIN(const IMC_Unit *unit))
{
unsigned int i;
+ ASSERT_ARGS(dump_dominance_frontiers);
fprintf(stderr, "\nDumping the Dominance Frontiers:"
"\n-------------------------------\n");
Modified: branches/assert_args/compilers/imcc/imcc.y
==============================================================================
--- branches/assert_args/compilers/imcc/imcc.y (original)
+++ branches/assert_args/compilers/imcc/imcc.y Fri Jan 2 20:32:24 2009
@@ -329,6 +329,7 @@
va_list ap;
SymReg *r[IMCC_MAX_FIX_REGS];
int i;
+ ASSERT_ARGS(MK_I);
for (p = opname, q = fmt; *q && *q != ' ';)
*p++ = *q++;
@@ -499,6 +500,7 @@
{
Instruction * const ins = _mk_instruction("", "%s:", 1, &r0, 0);
+ ASSERT_ARGS(INS_LABEL);
ins->type = ITLABEL;
r0->first_ins = ins;
@@ -513,6 +515,7 @@
iLABEL(PARROT_INTERP, ARGMOD_NULLOK(IMC_Unit *unit), ARGMOD(SymReg *r0))
{
Instruction * const i = INS_LABEL(interp, unit, r0, 1);
+ ASSERT_ARGS(iLABEL);
i->line = IMCC_INFO(interp)->line;
clear_state(interp);
@@ -524,6 +527,7 @@
iSUBROUTINE(PARROT_INTERP, ARGMOD_NULLOK(IMC_Unit *unit), ARGMOD(SymReg *r))
{
Instruction * const i = iLABEL(interp, unit, r);
+ ASSERT_ARGS(iSUBROUTINE);
r->type = (r->type & VT_ENCODED) ? VT_PCC_SUB|VT_ENCODED : VT_PCC_SUB;
r->pcc_sub = mem_allocate_zeroed_typed(pcc_sub_t);
@@ -584,6 +588,7 @@
char name[128];
SymReg *r;
Instruction *i;
+ ASSERT_ARGS(IMCC_create_itcall_label);
snprintf(name, sizeof (name), "%cpcc_sub_call_%d", IMCC_INTERNAL_CHAR,
IMCC_INFO(interp)->cnr++);
Modified: branches/assert_args/src/oo.c
==============================================================================
--- branches/assert_args/src/oo.c (original)
+++ branches/assert_args/src/oo.c Fri Jan 2 20:32:24 2009
@@ -568,9 +568,9 @@
{
INTVAL type;
const INTVAL typeid_exists = fail_if_type_exists(interp, name);
- ASSERT_ARGS(Parrot_oo_register_type);
PMC *classobj = VTABLE_get_class(interp, namespace);
+ ASSERT_ARGS(Parrot_oo_register_type);
if (!PMC_IS_NULL(classobj)) {
STRING *classname = VTABLE_get_string(interp, namespace);
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
