aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2012-04-25 23:19:58 +0000
committerDimitri Sokolyuk <demon@dim13.org>2012-04-25 23:19:58 +0000
commit9fe4b4f26402142dbe812d61107bb1a0668a9450 (patch)
tree2b9b4f87db19bace6d735c5b9a8d1c6b386d15d2
parented10b69ca911f2274ef4322c8d9148857d08f03e (diff)
spec 1.4 mvi -> sti
-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 e21c1ca..bf6280f 100644
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -22,7 +22,7 @@ enum { A, B, C, X, Y, Z, I, J, PC, SP, EX, IA,
Aux, nReg };
enum { EXT, SET, ADD, SUB, MUL, MLI, DIV, DVI,
- MOD, AND, BOR, XOR, SHR, ASR, SHL, MVI,
+ MOD, AND, BOR, XOR, SHR, ASR, SHL, STI,
IFB, IFC, IFE, IFN, IFG, IFA, IFL, IFU,
ADX = 0x1a, SBX, nOpt };
diff --git a/emu.c b/emu.c
index 2324ecd..ea351c6 100644
--- a/emu.c
+++ b/emu.c
@@ -261,7 +261,7 @@ shl(unsigned short *b, unsigned short *a)
}
void
-mvi(unsigned short *b, unsigned short *a)
+sti(unsigned short *b, unsigned short *a)
{
*b = *a;
++reg[I];
@@ -363,7 +363,7 @@ void (*op[nOpt])(unsigned short *a, unsigned short *b) = {
[SHR] = shr,
[ASR] = asr,
[SHL] = shl,
- [MVI] = mvi,
+ [STI] = sti,
[IFB] = ifb,
[IFC] = ifc,
[IFE] = ife,
diff --git a/gramar.y b/gramar.y
index 6b156b0..1a40b44 100644
--- a/gramar.y
+++ b/gramar.y
@@ -64,7 +64,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 SET ADD SUB MUL MLI DIV DVI MOD AND BOR XOR SHR ASR SHL STI
%token IFB IFC IFE IFN IFG IFA IFL IFU ADX SBX
%token NOP BRK DAT ORG
%token JSR INT IAG IAS HWN HWQ HWI
@@ -216,7 +216,7 @@ opcode
| SHR { $$ = 0x0c; }
| ASR { $$ = 0x0d; }
| SHL { $$ = 0x0e; }
- | MVI { $$ = 0x0f; }
+ | STI { $$ = 0x0f; }
| IFB { $$ = 0x10; }
| IFC { $$ = 0x11; }
| IFE { $$ = 0x12; }
diff --git a/lexer.l b/lexer.l
index 177173a..1c9e6c3 100644
--- a/lexer.l
+++ b/lexer.l
@@ -49,7 +49,7 @@ DEC [0-9]+
[Ss][Hh][Rr] return SHR;
[Aa][Ss][Rr] return ASR;
[Ss][Hh][Ll] return SHL;
-[Mm][Vv][Ii] return MVI;
+[Ss][Tt][Ii] return STI;
[Ii][Ff][Bb] return IFB;
[Ii][Ff][Cc] return IFC;
[Ii][Ff][Ee] return IFE;