diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index 741232c2e2..357654b82a 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -1,11 +1,6 @@ -+ 0.84: - -- signal 4 on datastack underflow on mac intel?? - -======================================================================== - + 0.85: +- signal 4 on datastack underflow on mac intel?? - why is a 'null' type inferred for the output of foo in : foo f ; : bar foo 4 4 = and ; diff --git a/contrib/space-invaders/cpu-8080.factor b/contrib/space-invaders/cpu-8080.factor index 5055082938..4abf61285d 100644 --- a/contrib/space-invaders/cpu-8080.factor +++ b/contrib/space-invaders/cpu-8080.factor @@ -1353,7 +1353,7 @@ SYMBOL: last-opcode : opcode ( -- ) #! Set the opcode number for the last instruction that was defined. - last-instruction global hash unit scan 16 base> ( [word] opcode -- ) + last-instruction global hash unit scan 16 base> dup last-opcode global set-hash instructions set-nth ; parsing INSTRUCTION: NOP ; opcode 00 cycles 04 @@ -1613,8 +1613,8 @@ INSTRUCTION: RST 38H ; opcode FF cycles 11 "P3" print "256 224" print "1" print - 224 [ ( cpu h -- h ) - 32 [ ( cpu h w -- w ) + 224 [ + 32 [ over 32 * over + HEX: 2400 + ! cpu h w addr >r pick r> swap cpu-ram nth [ 0 = [