Remove unused macros in goops.c

[bpt/guile.git] / libguile / instructions.h

diff --git a/libguile/instructions.h b/libguile/instructions.h
index 7575e6f..ad058cd 100644 (file)
--- a/libguile/instructions.h
+++ b/libguile/instructions.h
@@ -22,6 +22,8 @@
 #include <libguile.h>
 #include <libguile/vm-operations.h>
 
+#ifdef BUILDING_LIBGUILE
+
 enum scm_opcode
   {
 #define ENUM(opcode, tag, name, meta) scm_op_##tag = opcode,
@@ -29,55 +31,18 @@ enum scm_opcode
 #undef ENUM
   };
 
-#define SCM_PACK_RTL_8_8_8(op,a,b,c) ((op) | ((a) << 8) | ((b) << 16) | ((c) << 24))
-#define SCM_PACK_RTL_8_16(op,a,b) ((op) | ((a) << 8) | ((b) << 16))
-#define SCM_PACK_RTL_16_8(op,a,b) ((op) | ((a) << 8) | ((b) << 24))
-#define SCM_PACK_RTL_12_12(op,a,b) ((op) | ((a) << 8) | ((b) << 20))
-#define SCM_PACK_RTL_24(op,a) ((op) | ((a) << 8))
-
-#define SCM_UNPACK_RTL_8_8_8(op,a,b,c)    \
-  do                                      \
-    {                                     \
-      a = (op >> 8) & 0xff;               \
-      b = (op >> 16) & 0xff;              \
-      c = op >> 24;                       \
-    }                                     \
-  while (0)
-
-#define SCM_UNPACK_RTL_8_16(op,a,b)       \
-  do                                      \
-    {                                     \
-      a = (op >> 8) & 0xff;               \
-      b = op >> 16;                       \
-    }                                     \
-  while (0)
-
-#define SCM_UNPACK_RTL_16_8(op,a,b)       \
-  do                                      \
-    {                                     \
-      a = (op >> 8) & 0xffff;             \
-      b = op >> 24;                       \
-    }                                     \
-  while (0)
-
-#define SCM_UNPACK_RTL_12_12(op,a,b)      \
-  do                                      \
-    {                                     \
-      a = (op >> 8) & 0xfff;              \
-      b = op >> 20;                       \
-    }                                     \
-  while (0)
-
-#define SCM_UNPACK_RTL_24(op,a)           \
-  do                                      \
-    {                                     \
-      a = op >> 8;                        \
-    }                                     \
-  while (0)
+#define SCM_PACK_OP_24(op,arg)      (scm_op_##op | (arg) << 8)
+#define SCM_PACK_OP_8_8_8(op,a,b,c) SCM_PACK_OP_24 (op, (a) | ((b) << 8) | ((c) << 16))
+#define SCM_PACK_OP_8_16(op,a,b)    SCM_PACK_OP_24 (op, (a) | (b) << 8)
+#define SCM_PACK_OP_16_8(op,a,b)    SCM_PACK_OP_24 (op, (a) | (b) << 16)
+#define SCM_PACK_OP_12_12(op,a,b)   SCM_PACK_OP_24 (op, (a) | (b) << 12)
+#define SCM_PACK_OP_ARG_8_24(a,b)   ((a) | ((b) << 8))
 
 #define SCM_VM_NUM_INSTRUCTIONS (1<<8)
 #define SCM_VM_INSTRUCTION_MASK (SCM_VM_NUM_INSTRUCTIONS-1)
 
+#endif /* BUILDING_LIBGUILE  */
+
 SCM_INTERNAL SCM scm_instruction_list (void);
 
 SCM_INTERNAL void scm_bootstrap_instructions (void);