const uint8_t cmdListBi[] =
{"exit + - * / " // 1 -> 5
". dup drop swap < " // 6 -> 10
- "> = .hb gw dfn " // 11 -> 15
+ "> == .hb gw dfn " // 11 -> 15
"keyt , p@ p! not " // 16 -> 20
"list if then else begin " // 21 -> 25
"until eram .h ] num " // 26 -> 30
"push0 goto exec lu pushn " // 31 -> 35
"over push1 pwrd emit ; " // 36 -> 40
"@ ! h@ do loop " // 41 -> 45
- "i b@ a! and or " // 46 -> 50
- "*/ key cr ~ xor " // 51 -> 55
- "*2 /2 call0 call1 call2 " // 56 -> 60
- "call3 call4 ndrop " // 61 -> 63
+ "i ~ ^ & | " // 46 -> 50
+ "*/ key cr *2 /2 " // 51 -> 55
+ "call0 call1 call2 call3 call4 " // 56 -> 60
+ "ndrop " // 61 -> 61
};
-
-// "*/ key cr hist histclr " // 51 -> 55
-// "fasttimer slowtimer stat hstat fec " // 56 -> 60
-// "fecset fecbset fecbclr " // 61 -> 65
-// };
-
-#define LAST_PREDEFINED 63 // update this when we add commands to the built in list
+#define LAST_PREDEFINED 61 // update this when we add commands to the built in list
// these commands are interps
-static int16_t __inline__ RAMerrors(void){
+static int16_t RAMerrors(void){
int16_t errors;
#if defined(MSP430)
__asm__ __volatile__ ( "mov r9, %0\n" : [res] "=r" (errors));
c = nextPrintableChar();
- // comments
+ // ignore comments
while ((c == '(') || (c == 92)) {
switch (c) {
- // '(' + anything + ')'
- case '(':
+ case '(': // '(' + anything + ')'
c = skipStackComment();
break;
- // '\' backslash -- to end of line
- case 92:
+
+ case 92: // '\' backslash -- to end of line
getLine();
c = nextPrintableChar();
break;
+
default:
break;
}
addr = prog[progCounter];
}
- progCounter = progCounter + 1;
+ progCounter++;
+
if(x == 1){
// this is a goto
progCounter = addr;
int16_t rem;
uint8_t x[7];
+ /* TODO BUG: cannot handle minimum signed integer 0x8000 -> -32768 */
if (n < 0) {
uart_putchar('-');
n = -n;
void execN(int16_t opcode){
int16_t i,j,k,m,n;
- int16_t x,y,z;
+ int32_t x;
switch(opcode){
- case 0: // unused
+ case 0: // unused
break;
- case 1: // exit
+ case 1: // exit
xit = 1;
break;
- case 2: // +
+ case 2: // + ( a b -- a+b )
mathStack[1] += mathStack[0];
popMathStack();
break;
- case 3: // -
+ case 3: // - ( a b -- a-b )
mathStack[1] += -mathStack[0];
popMathStack();
break;
- case 4: // *
+ /*
+ case 4: // * ( a b -- a*b )
mathStack[1] = mathStack[0] * mathStack[1];
popMathStack();
break;
+ */
- case 5: // /
+ case 4: // * ( a b -- reshi reslo )
+#if defined(MSP430)
+ asm("dint");
+ MPYS = mathStack[1];
+ OP2 = mathStack[0];
+ mathStack[1] = RESHI;
+ mathStack[0] = RESLO;
+ asm("eint");
+#else
+ x = mathStack[0] * mathStack[1];
+ mathStack[1] = (int16_t)((x >> 16) & 0xffff);
+ mathStack[0] = (int16_t)(x & 0xffff);
+#endif
+ break;
+
+ case 5: // / ( a b -- a/b )
mathStack[1] = mathStack[1] / mathStack[0];
popMathStack();
break;
- case 6: // .
+ case 6: // . ( a -- )
printNumber(popMathStack());
break;
- case 7: // dup
+ case 7: // dup ( a -- a a )
pushMathStack(mathStack[0]);
break;
- case 8: // drop
+ case 8: // drop ( a -- )
i = popMathStack();
break;
- case 9: // swap
+ case 9: // swap ( a b -- b a )
i = mathStack[0];
mathStack[0] = mathStack[1];
mathStack[1] = i;
break;
- case 10: // <
+ case 10: // < ( a b -- a<b )
i = popMathStack();
if(mathStack[0] < i){
mathStack[0] = 1;
}
break;
- case 11: // >
+ case 11: // > ( a b -- a>b )
i = popMathStack();
if(mathStack[0] > i){
mathStack[0] = 1;
}
break;
- case 12: // =
+ case 12: // == ( a b -- a==b )
i = popMathStack();
if(i == mathStack[0]){
mathStack[0] = 1;
}
break;
- case 13: // .hb
+ case 13: // .hb ( a -- )
printHexByte(popMathStack());
break;
- case 14: // gw
+ case 14: // gw ( -- ) \ get word from input
getWord();
break;
- case 15: // dfn
+ case 15: // dfn ( -- ) \ create opcode and store word to cmdList
dfnFunc();
break;
- case 16: // keyt
- // return a 1 if keys are in ring buffer
- //i = (inputRingPtrXin - inputRingPtrXout) & 0x0F; // logical result assigned to i
- i = 0;
- pushMathStack(i);
- break;
+ case 16: // keyt ( -- flag )
+ // TODO: for interrupt-based UART I/O
+ // return a 1 if keys are in ring buffer
+ //i = (inputRingPtrXin - inputRingPtrXout) & 0x0F; // logical result assigned to i
+ i = 0;
+ pushMathStack(i);
+ break;
- case 17: // allot
- prog[progPtr] = popMathStack();
- progPtr = progPtr + 1;
+ case 17: // allot ( opcode -- ) \ push opcode to prog space
+ prog[progPtr++] = popMathStack();
if(progPtr >= PROG_SPACE){
uart_puts((str_t *)"ERR: prog full");
}
break;
- case 18: // p@
+ case 18: // p@ ( opaddr -- opcode )
i = mathStack[0];
mathStack[0] = prog[i];
break;
- case 19: // p!
+ case 19: // p! ( opcode opaddr -- )
i = popMathStack();
j = popMathStack();
prog[i] = j;
break;
- case 20: // not
+ case 20: // not ( a -- !a ) \ logical not
if(mathStack[0]){
mathStack[0] = 0;
} else {
}
break;
- case 21: // list
+ case 21: // list ( -- ) \ show defined words
listFunction();
break;
- case 22: // if
+ case 22: // if ( flag -- )
ifFunc(0);
break;
case 24: // else ( trapped in ':')
break;
- case 25: // begin
+ case 25: // begin ( -- ) ( -a- pcnt )
pushAddrStack(progCounter);
break;
- case 26: // until
+ case 26: // until ( flag -- ) ( addr -a- )
i = popAddrStack();
j = popMathStack();
if(j == 0){
pushMathStack(RAMerrors());
break;
- case 28: // .h
+ case 28: // .h ( a -- )
printHexWord(popMathStack());
break;
case 29: // ] ( trapped in interp )
break;
- case 30: // num
+ case 30: // num ( -- n flag ) \ is word in buffer a number?
numFunc();
break;
- case 31: // push0
+ case 31: // push0 ( -- 0 )
pushMathStack(0);
break;
ifFunc(1);
break;
- case 33: // exec
+ case 33: // exec ( opcode -- )
execFunc();
break;
- case 34: // lu
+ case 34: // lu ( -- opcode 1 | 0 )
luFunc();
break;
pushnFunc();
break;
- case 36: // over
+ case 36: // over ( a b -- a b a )
overFunc();
break;
- case 37: // push1
+ case 37: // push1 ( -- 1 )
pushMathStack(1);
break;
- case 38: // pwrd
+ case 38: // pwrd ( -- ) \ print word buffer
uart_puts((str_t *)wordBuffer);
break;
- case 39: // emit
+ case 39: // emit ( c -- )
uart_putchar(popMathStack());
break;
- case 40: // ;
+ case 40: // ; ( pcnt -a- )
i = progCounter;
progCounter = popAddrStack();
break;
- case 41: // @ read directly from memory address
- i = popMathStack();
- i = i >> 1; // divide by to
- j = dirMemory[i];
- pushMathStack(j);
+ case 41: // @ ( addr -- val ) \ read directly from memory address
+ i = mathStack[0] >> 1;
+ mathStack[0] = dirMemory[i];
break;
- case 42: // ! write directly to memory address words only!
+ case 42: // ! ( val addr -- ) \ write directly to memory address words only!
i = popMathStack(); // address to write to
i = i >> 1;
j = popMathStack(); // value to write
dirMemory[i] = j;
break;
- case 43: // h@
+ case 43: // h@ ( -- prog ) \ end of program code space
pushMathStack(progPtr);
break;
- case 44: // do
+ case 44: // do ( limit cnt -- ) ( -a- limit cnt pcnt )
i = popMathStack(); // start of count
j = popMathStack(); // end count
k = progCounter;
pushAddrStack(k); // address to remember for looping
break;
- case 45: // loop
+ case 45: // loop ( -- ) ( limit cnt pcnt -a- | limit cnt+1 pcnt )
j = popAddrStack(); // loop address
k = popAddrStack(); // count
m = popAddrStack(); // limit
}
break;
- case 46: // i
+ case 46: // i ( -- cnt ) \ loop counter value
j = addrStack[addrStackPtr+1];
pushMathStack(j);
break;
- case 47: // b@
+ case 47: // ~ ( a -- ~a ) \ bitwise complement
+ mathStack[0] = ~mathStack[0];
break;
-
- case 48: // a!
- i = popMathStack(); // address
- j = popMathStack(); // value
- /*setDAC(i,j);*/
+
+ case 48: // ^ ( a b -- a^b ) \ bitwise xor
+ mathStack[1] ^= mathStack[0];
+ popMathStack();
break;
- case 49: // and
+ case 49: // & ( a b -- a&b ) \ bitwise and
mathStack[1] &= mathStack[0];
popMathStack();
break;
- case 50: // or
+ case 50: // | ( a b -- a|b ) \bitwise or
mathStack[1] |= mathStack[0];
popMathStack();
break;
- case 51: // */ scale function
- x = popMathStack();
- y = popMathStack();
- z = mathStack[0];
- z = (z*y)/x;
- mathStack[0] = z;
+ case 51: // */ ( a b c -- reshi reslo ) \ (a*b)/c scale function
+#if defined(MSP430)
+ asm("dint");
+ MPYS = popMathStack();
+ OP2 = mathStack[1];
+ x = (int32_t)(((int32_t)RESHI << 16) | RESLO);
+ x = (int32_t)(x / mathStack[0]);
+ mathStack[1] = (int16_t)((x >> 16) & 0xffff);
+ mathStack[0] = (int16_t)(x & 0xffff);
+ asm("eint");
+#else
+ i = popMathStack();
+ j = mathStack[0];
+ k = mathStack[1];
+ x = (int32_t)(j * k);
+ x = (int32_t)(x / i);
+ mathStack[1] = (int16_t)((x >> 16) & 0xffff);
+ mathStack[0] = (int16_t)(x & 0xffff);
+#endif
break;
- case 52: // key get a key from input .... (wait for it)
+ case 52: // key ( -- c ) \ get a key from input .... (wait for it)
pushMathStack(uart_getchar());
break;
- case 53: // cr
+ case 53: // cr ( -- )
uart_putchar(0x0D);
uart_putchar(0x0A);
break;
- case 54: // ~ (bitwise complement)
- mathStack[0] = ~mathStack[0];
- break;
-
- case 55: // xor
- mathStack[1] ^= mathStack[0];
- popMathStack();
- break;
-
- case 56: // *2
+ case 54: // *2 ( a -- a<<1 )
mathStack[0] <<= 1;
break;
- case 57: // /2
+ case 55: // /2 ( a -- a>>1 )
mathStack[0] >>= 1;
break;
- case 58: // call0 ( &func -- *func() )
+ case 56: // call0 ( &func -- *func() )
i = mathStack[0];
mathStack[0] = (*(int16_t(*)(void)) i) ();
break;
- case 59: // call1 ( a &func -- *func(a) )
+ case 57: // call1 ( a &func -- *func(a) )
i = mathStack[0];
j = mathStack[1];
mathStack[1] = (*(int16_t(*)(int16_t)) i) (j);
popMathStack();
break;
- case 60: // call2 ( a b &func -- *func(a,b) )
+ case 58: // call2 ( a b &func -- *func(a,b) )
i = mathStack[0];
j = mathStack[1];
k = mathStack[2];
ndropFunc();
break;
- case 61: // call3 ( a b c &func -- *func(a,b,c) )
+ case 59: // call3 ( a b c &func -- *func(a,b,c) )
i = mathStack[0];
j = mathStack[1];
k = mathStack[2];
ndropFunc();
break;
- case 62: // call4 ( a b c d &func -- *func(a,b,c,d) )
+ case 60: // call4 ( a b c d &func -- *func(a,b,c,d) )
i = mathStack[0];
j = mathStack[1];
k = mathStack[2];
ndropFunc();
break;
- case 63: // ndrop ( (x)*n n -- ) drop n math stack cells
+ case 61: // ndrop ( (x)*n n -- ) drop n math stack cells
ndropFunc();
break;
projects / 430.git / commitdiff