isa: minor fixes

diff --git a/2_isa/data.ptex b/2_isa/data.ptex
index e86d52f40a03fae4757d5c6abf1f82c4110428a0..f5a349e789f428fbd05f536ad349316cf6adbb87 100644 (file)
--- a/2_isa/data.ptex
+++ b/2_isa/data.ptex
@@ -13,7 +13,8 @@ ins ('32', 'stackop', 'pop/push/disc/fetch from/to stack', '4 | 5 | 4 | 2 | 17',
 
 
 ins ('32', 'mov\{p,s\}f', 'Move from PSW/Stack', '4 | 5 | 4 | 1 | 18',
-'Conditions | OpCode (01100) | Register Destination| st | - ');
+'Conditions | OpCode (01100) | Register Destination| st | - ',
+'$p=1$, $s=0$');
 
 ins ('32', 'mov\{p,s\}t', 'Move to PSW/Stack', '4 | 5 | 4 | 1 | 18',
 'Conditions | OpCode (01101) | Register Source | st | - ',

diff --git a/2_isa/flags.tex b/2_isa/flags.tex
index 998e1ab346c6e0fca145080cfed022f21dcd78da..b3fd5a469e60a366e445b70a1180a7341d5dce43 100644 (file)
--- a/2_isa/flags.tex
+++ b/2_isa/flags.tex
@@ -7,7 +7,7 @@ In table~\ref{tab:flags} the flags that can suffix instructions are described. I
        H/L  & use high or low 16-bits & L (not set) \\ \hline
        F    & fill unused 16-bits with value of F & 0 (not set)\footnote{this means that andxf must be used, if the not specified 16-bit, should be preserve} \\ \hline
        S    & sign extension & 0 (not set) \\ \hline
-       +/-  & branch taken or not taken & + (taken) \\ \hline
+       +/-  & branch taken or not taken & + (set) \\ \hline
        A    & if set the shift operation will be arithmetic instead of logic & 0 (logic) \\ \hline
        \caption{ISA flag overview}
        \label{tab:flags}

diff --git a/2_isa/logic.ptex b/2_isa/logic.ptex
index 55a6889705ef70d4ff888acc1ac2dba82c86ec11..3643887170c4b009b7fbed55febee1ea7a6069b7 100644 (file)
--- a/2_isa/logic.ptex
+++ b/2_isa/logic.ptex
@@ -16,7 +16,7 @@ ins ('32', 'or', 'Or', '4 | 5 | 4 | 4 | 4 | 10 | 1',
 ins ('32', 'orx', 'Or im 16bit', '4 | 5 | 4 | 16 | 1 | 1 | 1',
 'Conditions | OpCode (00111) | Register Destination| Immediate | H/L | F | D');
 
-ins ('32', 'xor', 'Or', '4 | 5 | 4 | 4 | 4 | 10 | 1',
+ins ('32', 'xor', 'Xor', '4 | 5 | 4 | 4 | 4 | 10 | 1',
 'Conditions | OpCode (01001) | Register Destination|Register A (Source1)| Register B (Source2) | - | D');
 
 # ins ('32', 'xori', 'Xor im', '4 | 5 | 4 | 4 | 12 | 1 | 1 | 1', 'Conditions | OpCode | Register Destination|Register A (Source1)| Immediate | H/L | F | -');

diff --git a/2_isa/misc.ptex b/2_isa/misc.ptex
index 9a1d553172eeecb23f9dabe8a02d45178aa398d9..177c42932e51baccd2877934e0101f8da3a31d5f 100644 (file)
--- a/2_isa/misc.ptex
+++ b/2_isa/misc.ptex
@@ -1,16 +1,14 @@
 ins ('32', 'jumpop', 'Branch/ret operation', '4 | 5 | 16 | 3 | 2 | 1 | 1',
 'Conditions | OpCode (10110) | Immediate | - | Type | +/- | S',
-'This instruction should be used with it\'s aliases branch, call, ret and reti. No flags will be affected by this instructions.','','',
-'br-Branch relative-4/00|call-Branch relative and save pc to stack-4/01|ret-Return to adress on stack-4/10|ret-Return from interrupt to adress on stack-4/11');
+'This instruction should be used with it\'s aliases br, call, ret and reti. No flags will be affected by this instructions.','','',
+'br-Branch relative-4/00|call-Branch relative and save pc to stack-4/01|ret-Return to adress on stack-4/10|reti-Return from interrupt to adress on stack-4/11');
 
-ins ('32', 'branchreg', 'Branch; jump to value of reg', '4 | 5 | 4 | 16 | 1 | 1 | 1',
-'Conditions | OpCode (10111) | Register A | - | Type | +/- | -',
-'This instruction should be used with it\'s aliases branchr and callr. No flags will be affected by this instructions. If Type is set to 1, the current value of the programcounter is pushed onto the stack.');
+ins ('32', 'branchreg', 'Branch; jump to value of reg', '4 | 5 | 4 | 16 | 1 | 2 ',
+'Conditions | OpCode (10111) | Register A | - | Type | -',
+'This instruction should be used with it\'s aliases \texttt{brr} and \texttt{callr}. No flags will be affected by this instructions. If Type is set to 1, the current value of the programcounter is pushed onto the stack.');
 
 #ins ('32', 'call', 'Call; save pc+4 in stack, jump to pc+imm', '4 | 5 | 16 | 5 | 1 | 1', 'Conditions | OpCode | Immediate | - | +/- | S');
 
-#ins ('32', 'branchreg', 'Branch; branch to value of reg', '4 | 5 | 4 | 17 | 1 | 1', 'Conditions | OpCode | Register Source| - | +/- | S');
-
 #ins ('32', 'ret(i)', 'return (from interrupt)', '4 | 5 | 1 | 22 ', 'Conditions | OpCode | I |-');
 
 #ins ('32', 'ret', 'ret', '4 | 5 | 23 ', 'Conditions | OpCode | -');