isa: alias for shift and mov special

diff --git a/2_isa/data.ptex b/2_isa/data.ptex
index f5a349e789f428fbd05f536ad349316cf6adbb87..92922dd34ff61759db2d0c3e3a729c3276e79255 100644 (file)
--- a/2_isa/data.ptex
+++ b/2_isa/data.ptex
@@ -12,13 +12,15 @@ ins ('32', 'stackop', 'pop/push/disc/fetch from/to stack', '4 | 5 | 4 | 2 | 17',
 #ins ('32', 'fetch', 'get top-element from stack', '4 | 5 | 4 |  19', 'Conditions | OpCode | Register Destination | - ');
 
 
-ins ('32', 'mov\{p,s\}f', 'Move from PSW/Stack', '4 | 5 | 4 | 1 | 18',
+ins ('32', 'mov\\textit{special}from', 'Move from PSW/Stack', '4 | 5 | 4 | 1 | 18',
 'Conditions | OpCode (01100) | Register Destination| st | - ',
-'$p=1$, $s=0$');
+'','','',
+'movpf-move from PSW-3/1|movsf-move from Stack Pointer-3/0');
 
-ins ('32', 'mov\{p,s\}t', 'Move to PSW/Stack', '4 | 5 | 4 | 1 | 18',
+ins ('32', 'mov\\textit{special}to', 'Move to PSW/Stack', '4 | 5 | 4 | 1 | 18',
 'Conditions | OpCode (01101) | Register Source | st | - ',
-'This instruction will set PSW or Stack to the value stored in the source register. When the move is to PSW the flags will be set like they are set in the source register.');
+'This instruction will set PSW or Stack to the value stored in the source register. When the move is to PSW the flags will be set like they are set in the source register.','','',
+'movpt-move to PSW-3/1|movst-move to Stack Pointer-3/0');
 
 ins ('32', 'ldw', 'Load word; needs to be aligned to 32bit', '4 | 5 | 4 | 4 | 15',
 'Conditions | OpCode (01110) | Register Destination|Register Address| displacement ');

diff --git a/2_isa/logic.ptex b/2_isa/logic.ptex
index 15420bd01ce463d6ebc6e71b137c8533e9ec9bf2..eddd10c5087e9249534c7b715bb181efcb63c16c 100644 (file)
--- a/2_isa/logic.ptex
+++ b/2_isa/logic.ptex
@@ -25,9 +25,10 @@ ins ('32', 'xorx', 'Xor im 16bit', '4 | 5 | 4 | 16 | 1 | 1 | 1',
 'Conditions | OpCode (01001) | Register Destination| Immediate | H/L | F | D',
 '', '', '', 'not-Negate-3/1111111111111111-4/0-5/1');
 
-ins ('32', 'l\{l,r\}s', 'left/right shift', '4 | 5 | 4 | 4 | 5 | 6 | 1 | 1 | 1 | 1',
+ins ('32', 'shift', 'left/right shift', '4 | 5 | 4 | 4 | 5 | 6 | 1 | 1 | 1 | 1',
 'Conditions | OpCode (01010) | Register Destination|Register A (Source1)| Immediate | - | l/r | A | C | D',
-'',' | Will change if C is set | | ');
+'',' | Will change if C is set | | ', '',
+'lls-left shift-6/0-7/0|lrs-right shift-6/1-7/0|ars-arithmetic right shift-6/1-7/1');
 
 #plaintext ('\\mbox{}\\\\ \\todo{lls und lrs zusammenfassen $\rightarrow$ ein bit entscheidet fuer shift nach links oder rechts}');