drop support for .lbyte, .rbyte, .r40

Author: jakubfi

include/lexer_utils.h

@@ -46,7 +46,6 @@ extern int str_len;
 void llerror(char *s, ...);
 int unesc_char(char *c, int *esclen);
 int flag2mask(char c);
-int str2r40(char *str);
 int lex_int(char *str, int offset, int base, int *val);
 int lex_float(char *str, double *val);
 int str_append(char c);

include/prog.h

@@ -67,15 +67,12 @@ enum node_types {
 	N_UMINUS,
 	N_NEG,
 	N_WORD,
-	N_LBYTE,
-	N_RBYTE,
 	N_DWORD,
 	N_FLOAT,
 	N_RES,
 	N_ORG,
 	N_ASCII,
 	N_ASCIIZ,
-	N_R40,
 	N_ENTRY,
 	N_GLOBAL,
 	N_IFDEF,
@@ -124,7 +121,6 @@ int eval_multiword(struct st *t);
 int eval_res(struct st *t);
 int eval_org(struct st *t);
 int eval_string(struct st *t);
-int eval_r40(struct st *t);
 int eval_label(struct st *t);
 int eval_equ(struct st *t);
 int eval_const(struct st *t);

src/keywords.c

@@ -41,14 +41,11 @@ int kw_init()
 	PRAGMA_ADD(".include", P_INCLUDE); // handled in lexer
 	PRAGMA_ADD(".equ", P_EQU);
 	PRAGMA_ADD(".const", P_CONST);
-	PRAGMA_ADD(".lbyte", P_LBYTE);
-	PRAGMA_ADD(".rbyte", P_RBYTE);
 	PRAGMA_ADD(".word", P_WORD);
 	PRAGMA_ADD(".dword", P_DWORD);
 	PRAGMA_ADD(".float", P_FLOAT);
 	PRAGMA_ADD(".ascii", P_ASCII);
 	PRAGMA_ADD(".asciiz", P_ASCIIZ);
-	PRAGMA_ADD(".r40", P_R40);
 	PRAGMA_ADD(".res", P_RES);
 	PRAGMA_ADD(".org", P_ORG);
 	PRAGMA_ADD(".entry", P_ENTRY);

src/lexer.l

@@ -150,18 +150,6 @@ achar	[^\a\b\f\n\r\t\v\\\'\"]
 	return INT;
 }
 
-'...' {
-	int v = str2r40(yytext+1);
-	if (v < 0) {
-		loc_stack[loc_pos].ocol += -v;
-		llerror("Character invalid for R40 encoding");
-		return INVALID_STRING;
-	} else {
-		yylval.v = v;
-		return INT;
-	}
-}
-
  /* ---- FLAGS ----------------------------------------------------------- */
 
 {flags} {

src/lexer_utils.c

@@ -152,38 +152,6 @@ int flag2mask(char c)
 	}
 }
 
-// -----------------------------------------------------------------------
-int str2r40(char *str)
-{
-	int val = 0;
-	int mul = 1600;
-	char *s = str;
-
-	while (*s && (mul >= 1)) {
-		if ((*s >= 'A') && (*s <= 'Z')) {
-			val += mul * (*s - 64);
-		} else if ((*s >= 'a') && (*s <= 'z')) {
-			val += mul * (*s - 96);
-		} else if ((*s >= '0') && (*s <= '9')) {
-			val += mul * (*s - 21);
-		} else if (*s == ' ') {
-			val += mul * 0;
-		} else if (*s == '_') {
-			val += mul * 37;
-		} else if (*s == '%') {
-			val += mul * 38;
-		} else if (*s == '#') {
-			val += mul * 39;
-		} else {
-			return -(s-str+1);
-		}
-		mul /= 40;
-		s++;
-	}
-
-	return val;
-}
-
 // -----------------------------------------------------------------------
 void delchar(char *str, char c)
 {

src/parser.y

@@ -86,14 +86,11 @@ typedef struct YYLTYPE {
 %token P_INCLUDE ".include"
 %token P_EQU ".equ"
 %token P_CONST ".const"
-%token P_LBYTE ".lbyte"
-%token P_RBYTE ".rbyte"
 %token P_WORD ".word"
 %token P_DWORD ".dword"
 %token P_FLOAT ".float"
 %token P_ASCII ".ascii"
 %token P_ASCIIZ ".asciiz"
-%token P_R40 ".r40"
 %token P_RES ".res"
 %token P_ORG ".org"
 %token P_ENTRY ".entry"
@@ -212,14 +209,11 @@ pragma:
 	}
 	| P_EQU NAME expr { $$ = st_str(N_EQU, $2); st_arg_app($$, $3); free($2); }
 	| P_CONST NAME expr { $$ = st_str(N_CONST, $2); st_arg_app($$, $3); free($2); }
-	| P_LBYTE exprs { $$ = compose_list(N_LBYTE, $2); }
-	| P_RBYTE exprs { $$ = compose_list(N_RBYTE, $2); }
 	| P_WORD exprs { $$ = compose_list(N_WORD, $2); }
 	| P_DWORD exprs { $$ = compose_list(N_DWORD, $2); }
 	| P_FLOAT floats { $$ = compose_list(N_FLOAT, $2); }
 	| P_ASCII STRING { $$ = st_str(N_ASCII, $2); free($2); }
 	| P_ASCIIZ STRING { $$ = st_str(N_ASCIIZ, $2); free($2); }
-	| P_R40 STRING { $$ = st_str(N_R40, $2); free($2); }
 	| P_RES expr { $$ = st_arg(N_RES, $2, NULL); }
 	| P_RES expr ',' expr { $$ = st_arg(N_RES, $2, $4, NULL); }
 	| P_ORG expr { $$ = st_arg(N_ORG, $2, NULL); }

src/prog.c

@@ -62,15 +62,12 @@ struct eval_t eval_tab[] = {
 	{ "- (unary)",eval_1arg },
 	{ "~",		eval_1arg },
 	{ ".word",	eval_word },
-	{ ".lbyte",	eval_word },
-	{ ".rbyte",	eval_word },
 	{ ".dword",	eval_multiword },
 	{ ".float",	eval_multiword },
 	{ ".res",	eval_res },
 	{ ".org",	eval_org },
 	{ ".ascii",	eval_string },
 	{ ".asciiz",eval_string },
-	{ ".r40",	eval_r40},
 	{ ".entry",	eval_entry },
 	{ ".global",eval_global },
 	{ ".ifdef",	eval_ifdef },
@@ -308,20 +305,6 @@ int eval_word(struct st *t)
 			}
 			t->val = t->args->val;
 			break;
-		case N_RBYTE:
-			if ((t->args->val < 0) || (t->args->val > 255)) {
-				aaerror(t, "Value %i is not an 8-bit unsigned integer", t->args->val);
-				return -1;
-			}
-			t->val = t->args->val;
-			break;
-		case N_LBYTE:
-			if ((t->args->val < 0) || (t->args->val > 255)) {
-				aaerror(t, "Value %i is not an 8-bit unsigned integer", t->args->val);
-				return -1;
-			}
-			t->val = t->args->val << 8;
-			break;
 	}
 
 	t->type = N_INT;
@@ -471,27 +454,6 @@ int eval_string(struct st *t)
 	return 0;
 }
 
-// -----------------------------------------------------------------------
-int eval_r40(struct st *t)
-{
-	char *s = t->str;
-	int chars = strlen(s);
-	int words = (chars+2) / 3;
-
-	t->data = malloc(words * sizeof(uint16_t));
-	t->size = 0;
-	t->type = N_BLOB;
-
-	while (words > 0) {
-		t->data[t->size] = str2r40(s);
-		t->size++;
-		words--;
-		s += 3;
-	}
-
-	return 0;
-}
-
 // -----------------------------------------------------------------------
 int eval_label(struct st *t)
 {