[uim-commit] r2625 - branches/r5rs/sigscheme
kzk at freedesktop.org
kzk at freedesktop.org
Fri Dec 16 17:31:14 PST 2005
Author: kzk
Date: 2005-12-16 17:30:58 -0800 (Fri, 16 Dec 2005)
New Revision: 2625
Modified:
branches/r5rs/sigscheme/storage-compact.h
Log:
* sigscheme/storage-compact.h
- renaming macro names in accordance with the rule below.
_TAG_VALUE_ => _VAL_
_VALUE_ => _VAL_
- (SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET
SCM_OTHERS_CDR_EXT_VAL_OFFSET
SCM_OTHERS_CDR_PTR_VAL_OFFSET
SCM_OTHERS_CDR_VAL_OFFSET_SYMBOL
SCM_OTHERS_CDR_VAL_MASK_SYMBOL
SCM_OTHERS_CDR_VAL_OFFSET_STRING
SCM_OTHERS_CDR_VAL_MASK_STRING
SCM_OTHERS_CDR_VAL_OFFSET_VECTOR
SCM_OTHERS_CDR_VAL_MASK_VECTOR
SCM_OTHERS_CDR_VAL_OFFSET_VALUES
SCM_OTHERS_CDR_VAL_MASK_VALUES
SCM_OTHERS_CDR_VAL_OFFSET_FUNC
SCM_OTHERS_CDR_VAL_MASK_FUNC
SCM_OTHERS_CDR_VAL_OFFSET_PORT
SCM_OTHERS_CDR_VAL_MASK_PORT
SCM_OTHERS_CDR_VAL_OFFSET_CONTINUATION
SCM_OTHERS_CDR_VAL_MASK_CONTINUATION
SCM_OTHERS_CDR_VAL_OFFSET_C_POINTER
SCM_OTHERS_CDR_VAL_MASK_C_POINTER
SCM_OTHERS_CDR_VAL_OFFSET_C_FUNCPOINTER
SCM_OTHERS_CDR_VAL_MASK_C_FUNCPOINTER
SCM_OTHERS_CDR_VAL_OFFSET_FREECELL
SCM_OTHERS_CDR_VAL_MASK_FREECELL
SCM_IMM_VAL_OFFSET_INT
SCM_IMM_VAL_OFFSET_CHAR): follow the renaming
Modified: branches/r5rs/sigscheme/storage-compact.h
===================================================================
--- branches/r5rs/sigscheme/storage-compact.h 2005-12-17 00:44:27 UTC (rev 2624)
+++ branches/r5rs/sigscheme/storage-compact.h 2005-12-17 01:30:58 UTC (rev 2625)
@@ -257,11 +257,11 @@
(0x1 << SCM_OTHERS_CDR_PTR_TAG_OFFSET)
/* value offsets */
-#define SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET \
+#define SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET \
(SCM_OTHERS_CDR_PRIMARY_TAG_OFFSET + SCM_OTHERS_CDR_PRIMARY_TAG_WIDTH)
-#define SCM_OTHERS_CDR_EXT_VALUE_OFFSET \
+#define SCM_OTHERS_CDR_EXT_VAL_OFFSET \
(SCM_OTHERS_CDR_EXT_TAG_OFFSET + SCM_OTHERS_CDR_EXT_TAG_WIDTH)
-#define SCM_OTHERS_CDR_PTR_VALUE_OFFSET \
+#define SCM_OTHERS_CDR_PTR_VAL_OFFSET \
(SCM_OTHERS_CDR_PTR_TAG_OFFSET + SCM_OTHERS_CDR_PTR_TAG_WIDTH)
/* for specific types */
@@ -273,10 +273,10 @@
SCM_OTHERS_CDR_PRIMARY_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_SYMBOL \
SCM_OTHERS_CDR_PRIMARY_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_SYMBOL \
- SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_SYMBOL \
- (~0U << SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_SYMBOL \
+ SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_SYMBOL \
+ (~0U << SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_STRING \
SCM_OTHERS_CDR_PRIMARY_TAG_STRING
@@ -286,10 +286,10 @@
SCM_OTHERS_CDR_PRIMARY_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_STRING \
SCM_OTHERS_CDR_PRIMARY_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_STRING \
- SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_STRING \
- (~0U << SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_STRING \
+ SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_STRING \
+ (~0U << SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_VECTOR \
SCM_OTHERS_CDR_PRIMARY_TAG_VECTOR
@@ -299,10 +299,10 @@
SCM_OTHERS_CDR_PRIMARY_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_VECTOR \
SCM_OTHERS_CDR_PRIMARY_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_VECTOR \
- SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_VECTOR \
- (~0U << SCM_OTHERS_CDR_PRIMARY_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_VECTOR \
+ SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_VECTOR \
+ (~0U << SCM_OTHERS_CDR_PRIMARY_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_VALUES \
SCM_OTHERS_CDR_EXT_TAG_VALUES
@@ -312,10 +312,10 @@
SCM_OTHERS_CDR_EXT_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_VALUES \
SCM_OTHERS_CDR_EXT_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_VALUES \
- SCM_OTHERS_CDR_EXT_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_VALUES \
- (~0U << SCM_OTHERS_CDR_EXT_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_VALUES \
+ SCM_OTHERS_CDR_EXT_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_VALUES \
+ (~0U << SCM_OTHERS_CDR_EXT_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_FUNC \
SCM_OTHERS_CDR_EXT_TAG_FUNC
@@ -325,10 +325,10 @@
SCM_OTHERS_CDR_EXT_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_FUNC \
SCM_OTHERS_CDR_EXT_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_FUNC \
- SCM_OTHERS_CDR_EXT_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_FUNC \
- (~0U << SCM_OTHERS_CDR_EXT_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_FUNC \
+ SCM_OTHERS_CDR_EXT_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_FUNC \
+ (~0U << SCM_OTHERS_CDR_EXT_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_PORT \
SCM_OTHERS_CDR_EXT_TAG_PORT
@@ -338,10 +338,10 @@
SCM_OTHERS_CDR_EXT_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_PORT \
SCM_OTHERS_CDR_EXT_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_PORT \
- SCM_OTHERS_CDR_EXT_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_PORT \
- (~0U << SCM_OTHERS_CDR_EXT_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_PORT \
+ SCM_OTHERS_CDR_EXT_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_PORT \
+ (~0U << SCM_OTHERS_CDR_EXT_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_CONTINUATION \
SCM_OTHERS_CDR_EXT_TAG_CONTINUATION
@@ -351,10 +351,10 @@
SCM_OTHERS_CDR_EXT_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_CONTINUATION \
SCM_OTHERS_CDR_EXT_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_CONTINUATION \
- SCM_OTHERS_CDR_EXT_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_CONTINUATION \
- (~0U << SCM_OTHERS_CDR_EXT_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_CONTINUATION \
+ SCM_OTHERS_CDR_EXT_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_CONTINUATION \
+ (~0U << SCM_OTHERS_CDR_EXT_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_C_POINTER \
(SCM_OTHERS_CDR_EXT_TAG_POINTER | SCM_OTHERS_CDR_PTR_TAG_C_POINTER)
@@ -364,10 +364,10 @@
(SCM_OTHERS_CDR_EXT_TAG_WIDTH + SCM_OTHERS_CDR_PTR_TAG_WIDTH)
#define SCM_OTHERS_CDR_TAG_OFFSET_C_POINTER \
SCM_OTHERS_CDR_PTR_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_C_POINTER \
- SCM_OTHERS_CDR_PTR_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_C_POINTER \
- (~0U << SCM_OTHERS_CDR_PTR_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_C_POINTER \
+ SCM_OTHERS_CDR_PTR_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_C_POINTER \
+ (~0U << SCM_OTHERS_CDR_PTR_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_C_FUNCPOINTER \
(SCM_OTHERS_CDR_EXT_TAG_POINTER | SCM_OTHERS_CDR_PTR_TAG_C_FUNCPOINTER)
@@ -377,10 +377,10 @@
(SCM_OTHERS_CDR_EXT_TAG_WIDTH + SCM_OTHERS_CDR_PTR_TAG_WIDTH)
#define SCM_OTHERS_CDR_TAG_OFFSET_C_FUNCPOINTER \
SCM_OTHERS_CDR_PTR_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_C_FUNCPOINTER \
- SCM_OTHERS_CDR_PTR_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_C_FUNCPOINTER \
- (~0U << SCM_OTHERS_CDR_PTR_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_C_FUNCPOINTER \
+ SCM_OTHERS_CDR_PTR_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_C_FUNCPOINTER \
+ (~0U << SCM_OTHERS_CDR_PTR_VAL_OFFSET)
#define SCM_OTHERS_CDR_TAG_FREECELL \
SCM_OTHERS_CDR_EXT_TAG_FREECELL
@@ -390,10 +390,10 @@
SCM_OTHERS_CDR_EXT_TAG_WIDTH
#define SCM_OTHERS_CDR_TAG_OFFSET_FREECELL \
SCM_OTHERS_CDR_EXT_TAG_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_OFFSET_FREECELL \
- SCM_OTHERS_CDR_EXT_VALUE_OFFSET
-#define SCM_OTHERS_CDR_TAG_VALUE_MASK_FREECELL \
- (~0U << SCM_OTHERS_CDR_EXT_VALUE_OFFSET)
+#define SCM_OTHERS_CDR_VAL_OFFSET_FREECELL \
+ SCM_OTHERS_CDR_EXT_VAL_OFFSET
+#define SCM_OTHERS_CDR_VAL_MASK_FREECELL \
+ (~0U << SCM_OTHERS_CDR_EXT_VAL_OFFSET)
/*==============================================================================
Masks Offsets, and Tags : Immediates
@@ -416,9 +416,9 @@
#define SCM_IMM_TAG_UNDEF (SCM_TAG_IMM | (0x3 << 3) | (0x6 << 5))
/* offset */
-#define SCM_IMM_TAG_VALUE_OFFSET_INT \
+#define SCM_IMM_VAL_OFFSET_INT \
(SCM_GCBIT_OFFSET + SCM_GCBIT_WIDTH + SCM_TAG_WIDTH + 1)
-#define SCM_IMM_TAG_VALUE_OFFSET_CHAR \
+#define SCM_IMM_VAL_OFFSET_CHAR \
(SCM_GCBIT_OFFSET + SCM_GCBIT_WIDTH + SCM_TAG_WIDTH + 2)
/*=======================================
More information about the uim-commit
mailing list