Commit 6685bbb9 authored by Over_score's avatar Over_score

Merge branch '653-suggestion-for-a-second-access-to-ip' into 'master'

Second access to IP

Closes #653

See merge request !869
parents a4b69167 77f9d860
......@@ -57,7 +57,7 @@ Out: EC=24 FL_ASLIFT=0 RX=Stri:"String test"
; ip(Short Integer) --> Short Integer
;=======================================
In: FL_ASLIFT=0 FL_CPXRES=0 RX=ShoI:"5#7"
Out: EC=0 FL_CPXRES=0 FL_ASLIFT=1 RX=ShoI:"5#7"
Out: EC=0 FL_CPXRES=0 FL_ASLIFT=1 RX=LonI:"5"
......
......@@ -276,6 +276,9 @@
tamOperation = item;
tamTransitionSystem(TT_OPERATION);
}
else if(tamFunction == ITM_toINT && item == ITM_REGI) { //JM TO INT
tamTransitionSystem(TT_INT);
}
else if(tamFunction == ITM_toINT && item == ITM_STACK_D) {
tamTransitionSystem(TT_BASE10);
}
......@@ -1263,6 +1266,11 @@
leaveTamMode();
return;
case TT_INT :
fnIp(NOPARAM);
leaveTamMode();
return;
case TT_BASE10 :
reallyRunFunction(getOperation(), 10);
leaveTamMode();
......
......@@ -72,7 +72,8 @@
#define TT_BACKSPACE 7
#define TT_BASE10 8
#define TT_BASE16 9
#define TT_NOTHING 10
#define TT_INT 10
#define TT_NOTHING 11
#define DEBUG_LINES 68 // Used in for the debug panel
......
......@@ -77,6 +77,8 @@ void ipRema(void) {
void ipShoI(void) {
convertShortIntegerRegisterToLongIntegerRegister(REGISTER_X, REGISTER_X);
lastIntegerBase = 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment