Author: leo
Date: Fri Apr 22 02:14:09 2005
New Revision: 7904
Modified:
trunk/classes/deleg_pmc.pmc
trunk/classes/ref.pmc
trunk/classes/sharedref.pmc
Log:
MMD 34 - cleanup 1: remove obsolete macros
Modified: trunk/classes/deleg_pmc.pmc
==============================================================================
--- trunk/classes/deleg_pmc.pmc (original)
+++ trunk/classes/deleg_pmc.pmc Fri Apr 22 02:14:09 2005
@@ -24,65 +24,6 @@
#include "parrot/parrot.h"
#include <assert.h>
-/*
- * MMD dispatch macros
- */
-
-#define VTABLE_bitwise_xor(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BXOR)
-#define VTABLE_bitwise_xor_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_BXOR_INT)
-#define VTABLE_add(i, l, r, d) mmd_dispatch_v_ppp(i, l, r, d, MMD_ADD)
-#define VTABLE_add_int(i, l, r, d) mmd_dispatch_v_pip(i, l, r, d, MMD_ADD_INT)
-#define VTABLE_add_float(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d,
MMD_ADD_FLOAT)
-#define VTABLE_subtract(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SUBTRACT)
-#define VTABLE_subtract_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_SUBTRACT_INT)
-#define VTABLE_subtract_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_SUBTRACT_FLOAT)
-#define VTABLE_multiply(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_MULTIPLY)
-#define VTABLE_multiply_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_MULTIPLY_INT)
-#define VTABLE_multiply_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_MULTIPLY_FLOAT)
-#define VTABLE_divide(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_DIVIDE)
-#define VTABLE_divide_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_DIVIDE_INT)
-#define VTABLE_divide_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_DIVIDE_FLOAT)
-#define VTABLE_floor_divide(i,l,r,d)
mmd_dispatch_v_ppp(i,l,r,d,MMD_FLOOR_DIVIDE)
-#define VTABLE_floor_divide_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_FLOOR_DIVIDE_INT)
-#define VTABLE_floor_divide_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_FLOOR_DIVIDE_FLOAT)
-#define VTABLE_modulus(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_MOD)
-#define VTABLE_modulus_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_MOD_INT)
-#define VTABLE_modulus_float(i,l,r,d) mmd_dispatch_v_pnp(i,l,r,d,MMD_MOD_FLOAT)
-#define VTABLE_cmodulus(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_CMOD)
-#define VTABLE_cmodulus_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_CMOD_INT)
-#define VTABLE_cmodulus_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_CMOD_FLOAT)
-#define VTABLE_bitwise_and(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BAND)
-#define VTABLE_bitwise_and_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_BAND_INT)
-#define VTABLE_bitwise_ors(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SOR)
-#define VTABLE_bitwise_ors_str(i,l,r,d) mmd_dispatch_v_psp(i,l,r,d,MMD_SOR_STR)
-#define VTABLE_bitwise_ands(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SAND)
-#define VTABLE_bitwise_ands_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_SAND_STR)
-#define VTABLE_bitwise_xors(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SXOR)
-#define VTABLE_bitwise_xors_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_SXOR_STR)
-#define VTABLE_bitwise_shl(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BSL)
-#define VTABLE_bitwise_shl_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BSL_INT)
-#define VTABLE_bitwise_shr(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BSR)
-#define VTABLE_bitwise_shr_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BSR_INT)
-#define VTABLE_bitwise_or(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BOR)
-#define VTABLE_bitwise_or_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BOR_INT)
-#define VTABLE_concatenate(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_CONCAT)
-#define VTABLE_concatenate_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_CONCAT_STR)
-#define VTABLE_logical_or(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LOR)
-#define VTABLE_logical_and(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LAND)
-#define VTABLE_logical_xor(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LXOR)
-#define VTABLE_repeat(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_REPEAT)
-#define VTABLE_repeat_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_REPEAT_INT)
-#define VTABLE_cmp(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_CMP)
-#define VTABLE_cmp_num(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_NUMCMP)
-#define VTABLE_cmp_string(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_STRCMP)
-#define VTABLE_is_equal(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_EQ)
-#define VTABLE_is_equal_num(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_NUMEQ)
-#define VTABLE_is_equal_string(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_STREQ)
-#define VTABLE_pow(i, l, r, d) mmd_dispatch_v_ppp(i, l, r, d, MMD_POW)
-#define VTABLE_pow_float(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d,
MMD_POW_FLOAT)
-#define VTABLE_pow_int(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d, MMD_POW_INT)
-
-
pmclass deleg_pmc {
/*
Modified: trunk/classes/ref.pmc
==============================================================================
--- trunk/classes/ref.pmc (original)
+++ trunk/classes/ref.pmc Fri Apr 22 02:14:09 2005
@@ -24,65 +24,6 @@
#include "parrot/parrot.h"
#include "parrot/method_util.h"
-/*
- * MMD dispatch macros
- */
-
-#define VTABLE_bitwise_xor(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BXOR)
-#define VTABLE_bitwise_xor_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_BXOR_INT)
-#define VTABLE_add(i, l, r, d) mmd_dispatch_v_ppp(i, l, r, d, MMD_ADD)
-#define VTABLE_add_int(i, l, r, d) mmd_dispatch_v_pip(i, l, r, d, MMD_ADD_INT)
-#define VTABLE_add_float(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d,
MMD_ADD_FLOAT)
-#define VTABLE_subtract(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SUBTRACT)
-#define VTABLE_subtract_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_SUBTRACT_INT)
-#define VTABLE_subtract_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_SUBTRACT_FLOAT)
-#define VTABLE_multiply(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_MULTIPLY)
-#define VTABLE_multiply_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_MULTIPLY_INT)
-#define VTABLE_multiply_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_MULTIPLY_FLOAT)
-#define VTABLE_divide(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_DIVIDE)
-#define VTABLE_divide_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_DIVIDE_INT)
-#define VTABLE_divide_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_DIVIDE_FLOAT)
-#define VTABLE_floor_divide(i,l,r,d)
mmd_dispatch_v_ppp(i,l,r,d,MMD_FLOOR_DIVIDE)
-#define VTABLE_floor_divide_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_FLOOR_DIVIDE_INT)
-#define VTABLE_floor_divide_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_FLOOR_DIVIDE_FLOAT)
-#define VTABLE_modulus(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_MOD)
-#define VTABLE_modulus_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_MOD_INT)
-#define VTABLE_modulus_float(i,l,r,d) mmd_dispatch_v_pnp(i,l,r,d,MMD_MOD_FLOAT)
-#define VTABLE_cmodulus(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_CMOD)
-#define VTABLE_cmodulus_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_CMOD_INT)
-#define VTABLE_cmodulus_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_CMOD_FLOAT)
-#define VTABLE_bitwise_and(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BAND)
-#define VTABLE_bitwise_and_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_BAND_INT)
-#define VTABLE_bitwise_ors(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SOR)
-#define VTABLE_bitwise_ors_str(i,l,r,d) mmd_dispatch_v_psp(i,l,r,d,MMD_SOR_STR)
-#define VTABLE_bitwise_ands(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SAND)
-#define VTABLE_bitwise_ands_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_SAND_STR)
-#define VTABLE_bitwise_xors(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SXOR)
-#define VTABLE_bitwise_xors_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_SXOR_STR)
-#define VTABLE_bitwise_shl(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BSL)
-#define VTABLE_bitwise_shl_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BSL_INT)
-#define VTABLE_bitwise_shr(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BSR)
-#define VTABLE_bitwise_shr_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BSR_INT)
-#define VTABLE_bitwise_or(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BOR)
-#define VTABLE_bitwise_or_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BOR_INT)
-#define VTABLE_concatenate(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_CONCAT)
-#define VTABLE_concatenate_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_CONCAT_STR)
-#define VTABLE_logical_or(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LOR)
-#define VTABLE_logical_and(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LAND)
-#define VTABLE_logical_xor(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LXOR)
-#define VTABLE_repeat(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_REPEAT)
-#define VTABLE_repeat_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_REPEAT_INT)
-#define VTABLE_cmp(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_CMP)
-#define VTABLE_cmp_num(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_NUMCMP)
-#define VTABLE_cmp_string(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_STRCMP)
-#define VTABLE_is_equal(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_EQ)
-#define VTABLE_is_equal_num(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_NUMEQ)
-#define VTABLE_is_equal_string(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_STREQ)
-#define VTABLE_pow(i, l, r, d) mmd_dispatch_v_ppp(i, l, r, d, MMD_POW)
-#define VTABLE_pow_float(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d,
MMD_POW_FLOAT)
-#define VTABLE_pow_int(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d, MMD_POW_INT)
-
-
pmclass Ref does ref {
/*
Modified: trunk/classes/sharedref.pmc
==============================================================================
--- trunk/classes/sharedref.pmc (original)
+++ trunk/classes/sharedref.pmc Fri Apr 22 02:14:09 2005
@@ -36,64 +36,6 @@
#define LOCK_PMC(interp, pmc) LOCK(PMC_sync(pmc)->pmc_lock);
#define UNLOCK_PMC(interp, pmc) UNLOCK(PMC_sync(pmc)->pmc_lock);
-/*
- * MMD dispatch macros
- */
-
-#define VTABLE_bitwise_xor(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BXOR)
-#define VTABLE_bitwise_xor_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_BXOR_INT)
-#define VTABLE_add(i, l, r, d) mmd_dispatch_v_ppp(i, l, r, d, MMD_ADD)
-#define VTABLE_add_int(i, l, r, d) mmd_dispatch_v_pip(i, l, r, d, MMD_ADD_INT)
-#define VTABLE_add_float(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d,
MMD_ADD_FLOAT)
-#define VTABLE_subtract(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SUBTRACT)
-#define VTABLE_subtract_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_SUBTRACT_INT)
-#define VTABLE_subtract_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_SUBTRACT_FLOAT)
-#define VTABLE_multiply(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_MULTIPLY)
-#define VTABLE_multiply_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_MULTIPLY_INT)
-#define VTABLE_multiply_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_MULTIPLY_FLOAT)
-#define VTABLE_divide(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_DIVIDE)
-#define VTABLE_divide_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_DIVIDE_INT)
-#define VTABLE_divide_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_DIVIDE_FLOAT)
-#define VTABLE_floor_divide(i,l,r,d)
mmd_dispatch_v_ppp(i,l,r,d,MMD_FLOOR_DIVIDE)
-#define VTABLE_floor_divide_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_FLOOR_DIVIDE_INT)
-#define VTABLE_floor_divide_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_FLOOR_DIVIDE_FLOAT)
-#define VTABLE_modulus(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_MOD)
-#define VTABLE_modulus_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_MOD_INT)
-#define VTABLE_modulus_float(i,l,r,d) mmd_dispatch_v_pnp(i,l,r,d,MMD_MOD_FLOAT)
-#define VTABLE_cmodulus(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_CMOD)
-#define VTABLE_cmodulus_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_CMOD_INT)
-#define VTABLE_cmodulus_float(i,l,r,d)
mmd_dispatch_v_pnp(i,l,r,d,MMD_CMOD_FLOAT)
-#define VTABLE_bitwise_and(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BAND)
-#define VTABLE_bitwise_and_int(i,l,r,d)
mmd_dispatch_v_pip(i,l,r,d,MMD_BAND_INT)
-#define VTABLE_bitwise_ors(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SOR)
-#define VTABLE_bitwise_ors_str(i,l,r,d) mmd_dispatch_v_psp(i,l,r,d,MMD_SOR_STR)
-#define VTABLE_bitwise_ands(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SAND)
-#define VTABLE_bitwise_ands_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_SAND_STR)
-#define VTABLE_bitwise_xors(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_SXOR)
-#define VTABLE_bitwise_xors_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_SXOR_STR)
-#define VTABLE_bitwise_shl(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BSL)
-#define VTABLE_bitwise_shl_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BSL_INT)
-#define VTABLE_bitwise_shr(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BSR)
-#define VTABLE_bitwise_shr_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BSR_INT)
-#define VTABLE_bitwise_or(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_BOR)
-#define VTABLE_bitwise_or_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_BOR_INT)
-#define VTABLE_concatenate(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_CONCAT)
-#define VTABLE_concatenate_str(i,l,r,d)
mmd_dispatch_v_psp(i,l,r,d,MMD_CONCAT_STR)
-#define VTABLE_logical_or(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LOR)
-#define VTABLE_logical_and(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LAND)
-#define VTABLE_logical_xor(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_LXOR)
-#define VTABLE_repeat(i,l,r,d) mmd_dispatch_v_ppp(i,l,r,d,MMD_REPEAT)
-#define VTABLE_repeat_int(i,l,r,d) mmd_dispatch_v_pip(i,l,r,d,MMD_REPEAT_INT)
-#define VTABLE_cmp(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_CMP)
-#define VTABLE_cmp_num(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_NUMCMP)
-#define VTABLE_cmp_string(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_STRCMP)
-#define VTABLE_is_equal(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_EQ)
-#define VTABLE_is_equal_num(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_NUMEQ)
-#define VTABLE_is_equal_string(i,l,r) mmd_dispatch_i_pp(i,l,r,MMD_STREQ)
-#define VTABLE_pow(i, l, r, d) mmd_dispatch_v_ppp(i, l, r, d, MMD_POW)
-#define VTABLE_pow_float(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d,
MMD_POW_FLOAT)
-#define VTABLE_pow_int(i, l, r, d) mmd_dispatch_v_pnp(i, l, r, d, MMD_POW_INT)
-
pmclass SharedRef does ref need_ext is_shared extends Ref {
