Author: petdance
Date: Fri Jul 6 19:54:03 2007
New Revision: 19662
Modified:
trunk/src/interpreter.c
Log:
Consting and NNing parms
Modified: trunk/src/interpreter.c
==============================================================================
--- trunk/src/interpreter.c (original)
+++ trunk/src/interpreter.c Fri Jul 6 19:54:03 2007
@@ -51,33 +51,47 @@
/* HEADERIZER BEGIN: static */
static void dynop_register_switch( size_t n_old, size_t n_new );
-static void dynop_register_xx(
- Parrot_Interp interp,
+static void dynop_register_xx( Interp *interp /*NN*/,
size_t n_old,
size_t n_new,
- oplib_init_f init_func );
+ oplib_init_f init_func )
+ __attribute__nonnull__(1);
static oplib_init_f get_op_lib_init( int core_op, int which, PMC *lib );
-static void init_prederef( Interp *interp, int which );
-static void load_prederef( Interp *interp, int which );
-static void notify_func_table(
- Parrot_Interp interp,
+static void init_prederef( Interp *interp /*NN*/, int which )
+ __attribute__nonnull__(1);
+
+static void load_prederef( Interp *interp /*NN*/, int which )
+ __attribute__nonnull__(1);
+
+static void notify_func_table( Interp *interp /*NN*/,
op_func_t* table /*NN*/,
int on )
+ __attribute__nonnull__(1)
__attribute__nonnull__(2);
static void prederef_args(
void **pc_prederef,
- Interp *interp,
- opcode_t *pc,
- op_info_t *opinfo );
+ Interp *interp /*NN*/,
+ opcode_t *pc /*NN*/,
+ const op_info_t *opinfo /*NN*/ )
+ __attribute__nonnull__(2)
+ __attribute__nonnull__(3)
+ __attribute__nonnull__(4);
static opcode_t * runops_cgp( Interp *interp, opcode_t *pc );
static opcode_t * runops_exec( Interp *interp, opcode_t *pc );
static opcode_t * runops_jit( Interp *interp, opcode_t *pc );
-static opcode_t * runops_switch( Interp *interp, opcode_t *pc );
-static void stop_prederef( Interp *interp );
-static void turn_ev_check( Parrot_Interp interp, int on );
+static opcode_t * runops_switch( Interp *interp /*NN*/, opcode_t *pc /*NN*/ )
+ __attribute__nonnull__(1)
+ __attribute__nonnull__(2);
+
+static void stop_prederef( Interp *interp /*NN*/ )
+ __attribute__nonnull__(1);
+
+static void turn_ev_check( Interp *interp /*NN*/, int on )
+ __attribute__nonnull__(1);
+
/* HEADERIZER END: static */
/*
@@ -91,8 +105,8 @@
*/
static void
-prederef_args(void **pc_prederef, Interp *interp,
- opcode_t *pc, op_info_t *opinfo)
+prederef_args(void **pc_prederef, Interp *interp /*NN*/,
+ opcode_t *pc /*NN*/, const op_info_t *opinfo /*NN*/)
{
const PackFile_ConstTable * const const_table = interp->code->const_table;
@@ -107,7 +121,7 @@
ADD_OP_VAR_PART(interp, interp->code, pc, n);
for (i = 1; i < n; i++) {
- opcode_t arg = pc[i];
+ const opcode_t arg = pc[i];
int type;
if (i >= m) {
PMC * const sig = (PMC*) pc_prederef[1];
@@ -192,7 +206,7 @@
{
const size_t offset = pc_prederef - interp->code->prederef.code;
opcode_t * const pc = ((opcode_t *)interp->code->base.data) + offset;
- op_info_t *opinfo;
+ const op_info_t *opinfo;
size_t n;
if (*pc < 0 || *pc >= (opcode_t)interp->op_count)
@@ -259,7 +273,7 @@
*/
static void
-turn_ev_check(Parrot_Interp interp, int on)
+turn_ev_check(Interp *interp /*NN*/, int on)
{
const Prederef * const pi = &interp->code->prederef;
size_t i;
@@ -337,7 +351,7 @@
*/
static void
-load_prederef(Interp *interp, int which)
+load_prederef(Interp *interp /*NN*/, int which)
{
const oplib_init_f init_func = get_op_lib_init(1, which, NULL);
int (*get_op)(const char * name, int full);
@@ -361,7 +375,7 @@
*/
static void
-init_prederef(Interp *interp, int which)
+init_prederef(Interp *interp /*NN*/, int which)
{
load_prederef(interp, which);
if (!interp->code->prederef.code) {
@@ -423,7 +437,7 @@
*/
static void
-stop_prederef(Interp *interp)
+stop_prederef(Interp *interp /*NN*/)
{
interp->op_func_table = PARROT_CORE_OPLIB_INIT(1)->op_func_table;
if (interp->evc_func_table) {
@@ -654,7 +668,7 @@
*/
static opcode_t *
-runops_switch(Interp *interp, opcode_t *pc)
+runops_switch(Interp *interp /*NN*/, opcode_t *pc /*NN*/)
{
opcode_t * const code_start = (opcode_t *)interp->code->base.data;
opcode_t *pc_prederef;
@@ -942,7 +956,7 @@
*/
static void
-dynop_register_xx(Parrot_Interp interp,
+dynop_register_xx(Interp *interp /*NN*/,
size_t n_old, size_t n_new, oplib_init_f init_func)
{
op_lib_t *cg_lib, *new_lib;
@@ -1053,7 +1067,7 @@
*/
static void
-notify_func_table(Parrot_Interp interp, op_func_t* table /*NN*/, int on)
+notify_func_table(Interp *interp /*NN*/, op_func_t* table /*NN*/, int on)
{
const oplib_init_f init_func = get_op_lib_init(1, interp->run_core, NULL);
