(VALBITS, XTYPE): Adjust for new bit layout.

2 files changed, 6 insertions, 7 deletions

diff --git a/src/m/att3b.h b/src/m/att3b.h
index 79f9529524e..b92f7b52f00 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -58,7 +58,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
@@ -136,10 +136,9 @@ extern int sign_extend_temp;
 #if u3b2 || u3b5 || u3b15
 
 /* On 3b2/5/15, data space has high order bit on. */
+#define VALBITS 27
 #define VALMASK (((1<<VALBITS) - 1) | (1 << 31))
-#define XTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & 0x7F))
-#define GCTYPEBITS 5
-#define XADDRFIX(a)     ((a) |= 0X80000000)     /* Because of high order */
+#define XTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & GCTYPEMASK))
 
 #endif /* 3b2, 3b5 or 3b15 */
 
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index d00cda2ffe2..80dcbfad42d 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -66,7 +66,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define START_FILES crt0.o
 
-/* Define LD_SWITCH_MACHINE if your linker need it.
+/* Define LD_SWITCH_MACHINE if your linker needs it.
  */
 
 #define LD_SWITCH_MACHINE -e __start
@@ -74,9 +74,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #if     pfa50 || pfa70
 
 /* On A-50/60/70/80, data space has high order byte use. */
+#define VALBITS 26
 #define VALMASK (((1<<VALBITS) - 1) | 0x60000000)
-#define XTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & 0x1f))
-#define XGCTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & 0x1f))
+#define XTYPE(a) ((enum Lisp_Type) (((a) >> VALBITS) & GCTYPEMASK))
 
 #endif /* pfa50, pfa70 */