From 11cc5b6f06ca9bf1341eb6cc6e5055e5d01c2bc8 Mon Sep 17 00:00:00 2001
From: mvax <big.jt@protonmail.com>
Date: Sat, 6 May 2023 14:24:53 -0400
Subject: [PATCH] remove .feature requirment for addrsize function, silently
 ignore '.feature addrsize'

---
 doc/ca65.sgml      | 10 ----------
 src/ca65/feature.c |  3 ++-
 src/ca65/global.c  |  1 -
 src/ca65/global.h  |  1 -
 src/ca65/scanner.c | 17 -----------------
 5 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 258808998..b4ef3e188 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -1409,10 +1409,6 @@ either a string or an expression value.
         .endmacro
   </verb></tscreen>
 
-  This command is new and must be enabled with the <tt/.FEATURE addrsize/ command.
-
-  See: <tt><ref id=".FEATURE" name=".FEATURE"></tt>
-
 
 <sect1><tt>.BANK</tt><label id=".BANK"><p>
 
@@ -2795,12 +2791,6 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
   <descrip>
 
-  <tag><tt>addrsize</tt><label id="addrsize"></tag>
-
-    Enables the .ADDRSIZE pseudo function. This function is experimental and not enabled by default.
-
-    See also: <tt><ref id=".ADDRSIZE" name=".ADDRSIZE"></tt>
-
   <tag><tt>at_in_identifiers</tt><label id="at_in_identifiers"></tag>
 
     Accept the at character ('@') as a valid character in identifiers. The
diff --git a/src/ca65/feature.c b/src/ca65/feature.c
index 41177d66b..8b915cfda 100644
--- a/src/ca65/feature.c
+++ b/src/ca65/feature.c
@@ -118,10 +118,11 @@ void SetFeature (feature_t Feature, unsigned char On)
         case FEAT_C_COMMENTS:                 CComments         = On;    break;
         case FEAT_FORCE_RANGE:                ForceRange        = On;    break;
         case FEAT_UNDERLINE_IN_NUMBERS:       UnderlineInNumbers= On;    break;
-        case FEAT_ADDRSIZE:                   AddrSize          = On;    break;
         case FEAT_BRACKET_AS_INDIRECT:        BracketAsIndirect = On;    break;
         case FEAT_STRING_ESCAPES:             StringEscapes     = On;    break;
         case FEAT_LONG_JSR_JMP_RTS:           LongJsrJmpRts     = On;    break;
+        /* Accept, but ignore addrsize */
+        case FEAT_ADDRSIZE:                                              break;
         default:                                                         break;
     }
 }
diff --git a/src/ca65/global.c b/src/ca65/global.c
index 337677e31..050d19e09 100644
--- a/src/ca65/global.c
+++ b/src/ca65/global.c
@@ -85,5 +85,4 @@ unsigned char OrgPerSeg          = 0;   /* Make .org local to current seg */
 unsigned char CComments          = 0;   /* Allow C like comments */
 unsigned char ForceRange         = 0;   /* Force values into expected range */
 unsigned char UnderlineInNumbers = 0;   /* Allow underlines in numbers */
-unsigned char AddrSize           = 0;   /* Allow .ADDRSIZE function */
 unsigned char BracketAsIndirect  = 0;   /* Use '[]' not '()' for indirection */
diff --git a/src/ca65/global.h b/src/ca65/global.h
index 46fb6c763..b3de99df5 100644
--- a/src/ca65/global.h
+++ b/src/ca65/global.h
@@ -87,7 +87,6 @@ extern unsigned char    OrgPerSeg;          /* Make .org local to current seg */
 extern unsigned char    CComments;          /* Allow C like comments */
 extern unsigned char    ForceRange;         /* Force values into expected range */
 extern unsigned char    UnderlineInNumbers; /* Allow underlines in numbers */
-extern unsigned char    AddrSize;           /* Allow .ADDRSIZE function */
 extern unsigned char    BracketAsIndirect;  /* Use '[]' not '()' for indirection */
 
 
diff --git a/src/ca65/scanner.c b/src/ca65/scanner.c
index add365e84..185100025 100644
--- a/src/ca65/scanner.c
+++ b/src/ca65/scanner.c
@@ -748,24 +748,7 @@ static token_t FindDotKeyword (void)
     R = bsearch (&K, DotKeywords, sizeof (DotKeywords) / sizeof (DotKeywords [0]),
                  sizeof (DotKeywords [0]), CmpDotKeyword);
     if (R != 0) {
-
-        /* By default, disable any somewhat experiemental DotKeyword. */
-
-        switch (R->Tok) {
-
-            case TOK_ADDRSIZE:
-                /* Disallow .ADDRSIZE function by default */
-                if (AddrSize == 0) {
-                    return TOK_NONE;
-                }
-                break;
-
-            default:
-                break;
-        }
-
         return R->Tok;
-
     } else {
         return TOK_NONE;
     }