aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-04-25 23:18:32 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-04-25 23:18:32 +0000
commited10b69ca911f2274ef4322c8d9148857d08f03e (patch)
tree8c6c5b0693e491dd1380c4aa923dc4189a1cf850
parent4e946e3c1783e48133b861ee5542c88647d1eb6d (diff)
spec 1.4 sux -> sbx
-rw-r--r--dcpu16.h2
-rw-r--r--emu.c4
-rw-r--r--gramar.y4
-rw-r--r--lexer.l2
4 files changed, 6 insertions, 6 deletions
diff --git a/dcpu16.h b/dcpu16.h
index 12b36b2..e21c1ca 100644
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -24,7 +24,7 @@ enum { A, B, C, X, Y, Z, I, J, PC, SP, EX, IA,
enum { EXT, SET, ADD, SUB, MUL, MLI, DIV, DVI,
MOD, AND, BOR, XOR, SHR, ASR, SHL, MVI,
IFB, IFC, IFE, IFN, IFG, IFA, IFL, IFU,
- ADX = 0x1a, SUX, nOpt };
+ ADX = 0x1a, SBX, nOpt };
enum { NOP, JSR, BRK,
INT = 0x08, IAG, IAS,
diff --git a/emu.c b/emu.c
index 8752c8f..2324ecd 100644
--- a/emu.c
+++ b/emu.c
@@ -337,7 +337,7 @@ adx(unsigned short *b, unsigned short *a)
}
void
-sux(unsigned short *b, unsigned short *a)
+sbx(unsigned short *b, unsigned short *a)
{
int tmp = *b;
@@ -373,7 +373,7 @@ void (*op[nOpt])(unsigned short *a, unsigned short *b) = {
[IFU] = ifu,
[IFL] = ifl,
[ADX] = adx,
- [SUX] = sux,
+ [SBX] = sbx,
};
unsigned short *
diff --git a/gramar.y b/gramar.y
index 08c4467..6b156b0 100644
--- a/gramar.y
+++ b/gramar.y
@@ -65,7 +65,7 @@ struct label {
%token PUSH POP PEEK PICK SP PC EX
%token SET ADD SUB MUL MLI DIV DVI MOD AND BOR XOR SHR ASR SHL MVI
-%token IFB IFC IFE IFN IFG IFA IFL IFU ADX SUX
+%token IFB IFC IFE IFN IFG IFA IFL IFU ADX SBX
%token NOP BRK DAT ORG
%token JSR INT IAG IAS HWN HWQ HWI
%token LBR RBR LBRACE RBRACE LPAR RPAR
@@ -226,7 +226,7 @@ opcode
| IFL { $$ = 0x16; }
| IFU { $$ = 0x17; }
| ADX { $$ = 0x1a; }
- | SUX { $$ = 0x1b; }
+ | SBX { $$ = 0x1b; }
;
extended
diff --git a/lexer.l b/lexer.l
index b48f8ab..177173a 100644
--- a/lexer.l
+++ b/lexer.l
@@ -59,7 +59,7 @@ DEC [0-9]+
[Ii][Ff][Ll] return IFL;
[Ii][Ff][Uu] return IFU;
[Aa][Dd][Xx] return ADX;
-[Ss][Uu][Xx] return SUX;
+[Ss][Bb][Xx] return SBX;
[Nn][Oo][Pp] return NOP;
[Jj][Ss][Rr] return JSR;