[svn:parrot] r43237 - branches/pmc_freeze_cleanup/src

[tewk at svn.parrot.org]

Author: tewk
Date: Thu Dec 24 18:19:43 2009
New Revision: 43237
URL: https://trac.parrot.org/parrot/changeset/43237

Log:
simplify pmc_freeze macros

Modified:
   branches/pmc_freeze_cleanup/src/pmc_freeze.c

Modified: branches/pmc_freeze_cleanup/src/pmc_freeze.c
==============================================================================
--- branches/pmc_freeze_cleanup/src/pmc_freeze.c	Thu Dec 24 18:19:35 2009	(r43236)
+++ branches/pmc_freeze_cleanup/src/pmc_freeze.c	Thu Dec 24 18:19:43 2009	(r43237)
@@ -288,9 +288,7 @@
     (io)->pos += (x); \
 } while (0)
 
-#define BYTECODE_SHIFT_OK(io) \
-    PARROT_ASSERT(GET_VISIT_CURSOR(io) <= \
-        (opcode_t *)(((char *)Buffer_bufstart((io)->buffer)) + (io)->input_length))
+#define BYTECODE_SHIFT_OK(io) PARROT_ASSERT((io)->pos <= (io)->input_length)
 
 
 PARROT_INLINE
@@ -334,7 +332,7 @@
 static INTVAL
 OUTPUT_LENGTH(ARGIN(visit_info *io)) {
     ASSERT_ARGS(OUTPUT_LENGTH)
-    return sizeof (opcode_t) * (GET_VISIT_CURSOR(io) - ((opcode_t *)Buffer_bufstart(io->buffer)));
+    return io->pos;
 }
 
 /*
@@ -351,9 +349,7 @@
 static INTVAL
 INFO_HAS_DATA(ARGIN(visit_info *io)) {
     ASSERT_ARGS(INFO_HAS_DATA)
-    return sizeof (opcode_t) *
-        (GET_VISIT_CURSOR(io) <
-            (opcode_t *)(((char *)Buffer_bufstart(io->buffer)) + io->input_length));
+    return io->pos < io->input_length;
 }