Change test output expected string layout

[emu8051.git] / src / cpu8051.c

diff --git a/src/cpu8051.c b/src/cpu8051.c
index 58a0e79..1fd0251 100644 (file)
--- a/src/cpu8051.c
+++ b/src/cpu8051.c
@@ -28,9 +28,13 @@
 #include "reg8051.h"
 #include "cpu8051.h"
 #include "memory.h"
+#include "psw.h"
 #include "disasm.h"
+#include "options.h"
 #include "instructions_8051.h"
 
+extern struct options_t options;
+
 /* Check if the address is a breakpoint */
 int
 IsBreakpoint(unsigned int address)
@@ -46,6 +50,16 @@ IsBreakpoint(unsigned int address)
        return 0;
 }
 
+/* Check if the address is a stop point */
+int
+IsStoppoint(unsigned int address)
+{
+       if ((options.stop_address != 0) && (options.stop_address == address))
+               return 1;
+       else
+               return 0;
+}
+
 /* Show Breakpoints list */
 void
 ShowBreakpoints(void)
@@ -269,18 +283,27 @@ process_timer(uint8_t tl, uint8_t th, uint8_t tf_mask, uint8_t TR, uint8_t mode,
              uint8_t GATE, uint32_t TimerCounter)
 {
        unsigned int tmp;
+       unsigned int prescaler;
 
        switch (mode) {
        case 0:
-               /* Mode 0, 13-bits counter. */
-               tmp = cpu8051_ReadD(th) * 0x100 + cpu8051_ReadD(tl);
-               tmp++;
-               tmp &= 0x1FFF; /* We keep only 13 bits */
-
-               if (tmp == 0)  /* If overflow set TF0 */
-                       cpu8051_WriteD(_TCON_, cpu8051_ReadD(_TCON_) | tf_mask);
-               cpu8051_WriteD(_TH0_, tmp / 0x100);
-               cpu8051_WriteD(_TL0_, tmp & 0xFF);
+               /* Mode 0, 8-bit timer "TH" with "TL" as 5-bit prescaler. */
+               prescaler = cpu8051_ReadD(tl);
+               prescaler++;
+               prescaler &= 0x1F; /* We keep only 5 bits */
+               cpu8051_WriteD(tl, prescaler);
+
+               if (prescaler == 0) {
+                       /* If overflow, increment TH */
+                       tmp = cpu8051_ReadD(th);
+                       tmp++;
+                       tmp &= 0xFF; /* We keep only 8 bits */
+
+                       if (tmp == 0)  /* If overflow set TF */
+                               cpu8051_WriteD(_TCON_, cpu8051_ReadD(_TCON_) | tf_mask);
+
+                       cpu8051_WriteD(th, tmp);
+               }
                break;
        case 1:
                /* Mode 1, 16-bits counter */
@@ -289,8 +312,8 @@ process_timer(uint8_t tl, uint8_t th, uint8_t tf_mask, uint8_t TR, uint8_t mode,
                tmp &= 0xFFFF; /* We keep only 16 bits */
                if (tmp == 0) /* If overflow set TF0 */
                        cpu8051_WriteD(_TCON_, cpu8051_ReadD(_TCON_) | tf_mask);
-               cpu8051_WriteD(_TH0_, (tmp / 0x100));
-               cpu8051_WriteD(_TL0_, (tmp & 0xFF));
+               cpu8051_WriteD(th, (tmp / 0x100));
+               cpu8051_WriteD(tl, (tmp & 0xFF));
                break;
        case 2:
                /* Mode 2, 8-bits counter with Auto-Reload */
@@ -374,6 +397,12 @@ cpu8051_Exec(void)
        cpu8051.pc++;
        insttiming = (*opcode_table[opcode])(); /* Function callback. */
 
+       /*
+        * Parity bit (p): is automatically set or cleared in each machine
+        * cycle to establish even parity in the accumulator.
+        */
+       psw_compute_parity_bit();
+
        for (i = 0; i < insttiming; i++) {
                cpu8051_CheckInterrupts();
                cpu8051_DoTimers();
@@ -472,7 +501,7 @@ cpu8051_get_instruction_size(unsigned char opcode)
        return InstSizesTbl[opcode];
 }
 
-/* Display instruction menmonic. */
+/* Display instruction mnemonic. */
 void
 cpu8051_disasm_mnemonic(unsigned char OpCode, char *buf)
 {
@@ -610,7 +639,7 @@ cpu8051_Disasm(unsigned int Address, char *Text)
        for (; len < 17;)
                len += sprintf(&Text[len], " ");
 
-       /* Display instruction menmonic. */
+       /* Display instruction mnemonic. */
        len += sprintf(&Text[len], "%s ",
                              InstTextTbl[InstTypesTbl[OpCode]]);
        ArgTblOfs = OpCode << 2;