Fix checkpatch warnings
[emu8051.git] / src / common / cpu8051.c
index d789bd6..7eb3db9 100644 (file)
@@ -28,7 +28,7 @@ extern struct options_t options;
 
 /* Check if the address is a breakpoint */
 int
-IsBreakpoint(unsigned int address)
+breakpoint_is_defined(unsigned int address)
 {
        int k;
 
@@ -41,19 +41,9 @@ IsBreakpoint(unsigned int address)
        return false;
 }
 
-/* Check if the address is a stop point */
-int
-IsStoppoint(unsigned int address)
-{
-       if ((options.stop_address != 0) && (options.stop_address == address))
-               return true;
-       else
-               return false;
-}
-
 /* Show Breakpoints list */
 void
-ShowBreakpoints(void)
+breakpoints_show(void)
 {
        int k;
 
@@ -61,39 +51,40 @@ ShowBreakpoints(void)
                printf("Breakpoints:\n");
                for (k = 0; k < cpu8051.bp_count; k++)
                        printf("  $%.4X\n", cpu8051.bp[k]);
-       } else
+       } else {
                printf("No breakpoints defined\n");
+       }
 }
 
 /* Set Breakpoint at address at the end of the breakpoint list */
 void
-SetBreakpoint(unsigned int address)
+breakpoint_set(unsigned int address)
 {
        int rc;
 
        rc = memory_check_address(PGM_MEM_ID, address, DISPLAY_ERROR_YES);
-       if (rc == false)
+       if (!rc)
                return; /* Error */
 
        /* Check if breakpoint is already defined. */
-       if ((IsBreakpoint(address) == false) &&
+       if ((breakpoint_is_defined(address) == false) &&
            (cpu8051.bp_count < MAXBP))
                cpu8051.bp[cpu8051.bp_count++] = address;
 }
 
 /* Clear Breakpoint at Address from list */
 void
-ClearBreakpoint(unsigned int address)
+breakpoint_clr(unsigned int address)
 {
        int k;
        int rc;
 
        rc = memory_check_address(PGM_MEM_ID, address, DISPLAY_ERROR_YES);
-       if (rc == false)
+       if (!rc)
                return; /* Error */
 
        /* Check if breakpoint is defined. */
-       if (IsBreakpoint(address) == false) {
+       if (breakpoint_is_defined(address) == false) {
                log_err("No breakpoint defined at address $%X", address);
                return;
        }
@@ -109,19 +100,29 @@ ClearBreakpoint(unsigned int address)
 
 /* Clear all breakpoints */
 void
-ClearAllBreakpoints(void)
+breakpoints_clr_all(void)
 {
        cpu8051.bp_count = 0;
 }
 
 /* Toggle the breakpoint at Address. */
 void
-ToggleBreakpoint(unsigned int address)
+breakpoint_toggle(unsigned int address)
 {
-       if (IsBreakpoint(address))
-               ClearBreakpoint(address);
+       if (breakpoint_is_defined(address))
+               breakpoint_clr(address);
        else
-               SetBreakpoint(address);
+               breakpoint_set(address);
+}
+
+/* Check if the address is a stop point */
+static int
+stop_point_is_defined(unsigned int address)
+{
+       if ((options.stop_address != 0) && (options.stop_address == address))
+               return true;
+       else
+               return false;
 }
 
 void
@@ -142,7 +143,7 @@ cpu8051_init(void)
 
 /* Reset the registers and CPU state */
 void
-cpu8051_Reset(void)
+cpu8051_reset(void)
 {
        cpu8051.pc = 0;
        cpu8051.clock = 0;
@@ -177,21 +178,21 @@ cpu8051_convert_bit_address(uint8_t bit_address, uint8_t *byte_address,
 
 /* Write with a direct addressing mode at Address the new Value */
 void
-cpu8051_WriteD(unsigned int Address, unsigned char Value)
+cpu8051_WriteD(unsigned int address, unsigned char value)
 {
-       memory_write8(INT_MEM_ID, Address, Value);
+       memory_write8(INT_MEM_ID, address, value);
 }
 
 /* Write with an indirect addressing mode at Address the new Value */
 void
-cpu8051_WriteI(unsigned int Address, unsigned char Value)
+cpu8051_WriteI(unsigned int address, unsigned char value)
 {
-       if (Address > 0x7F) {
-               memory_write8(EXT_MEM_ID, Address, Value);
+       if (address > 0x7F) {
+               memory_write8(EXT_MEM_ID, address, value);
                return;
        }
 
-       memory_write8(INT_MEM_ID, Address, Value);
+       memory_write8(INT_MEM_ID, address, value);
 }
 
 /* Write with a bit addressing mode at BitAddress the new Value */
@@ -200,34 +201,34 @@ cpu8051_WriteB(uint8_t bit_address, uint8_t value)
 {
        uint8_t byte_address;
        uint8_t bit_number;
-       unsigned char ByteValue, ByteMask;
+       unsigned char byte_val, byte_mask;
 
        cpu8051_convert_bit_address(bit_address, &byte_address, &bit_number);
 
-       ByteMask = ((1 << bit_number) ^ 0xFF);
-       ByteValue = cpu8051_ReadD(byte_address) & ByteMask;
-       ByteValue += value << bit_number;
-       cpu8051_WriteD(byte_address, ByteValue);
+       byte_mask = ((1 << bit_number) ^ 0xFF);
+       byte_val = cpu8051_ReadD(byte_address) & byte_mask;
+       byte_val += value << bit_number;
+       cpu8051_WriteD(byte_address, byte_val);
 }
 
 /* Read with a direct addressing mode at Address */
 unsigned char
-cpu8051_ReadD(unsigned int Address)
+cpu8051_ReadD(unsigned int address)
 {
-       if (Address > 0xFF)
-               return memory_read8(EXT_MEM_ID, Address);
+       if (address > 0xFF)
+               return memory_read8(EXT_MEM_ID, address);
        else
-               return memory_read8(INT_MEM_ID, Address);
+               return memory_read8(INT_MEM_ID, address);
 }
 
 /* Read with a indirect addressing mode at Address */
 unsigned char
-cpu8051_ReadI(unsigned int Address)
+cpu8051_ReadI(unsigned int address)
 {
-       if (Address > 0x7F)
-               return memory_read8(EXT_MEM_ID, Address);
+       if (address > 0x7F)
+               return memory_read8(EXT_MEM_ID, address);
        else
-               return memory_read8(INT_MEM_ID, Address);
+               return memory_read8(INT_MEM_ID, address);
 }
 
 /* Read with a bit addressing mode at BitAddress */
@@ -236,13 +237,13 @@ cpu8051_ReadB(uint8_t bit_address)
 {
        uint8_t byte_address;
        uint8_t bit_number;
-       unsigned char BitValue;
+       unsigned char bit_value;
 
        cpu8051_convert_bit_address(bit_address, &byte_address, &bit_number);
 
-       BitValue = (cpu8051_ReadD(byte_address) >> bit_number);
-       BitValue &= 1;
-       return BitValue;
+       bit_value = (cpu8051_ReadD(byte_address) >> bit_number);
+       bit_value &= 1;
+       return bit_value;
 }
 
 static int
@@ -271,7 +272,7 @@ cpu8051_process_interrupt(int pc, int pri)
 
 /* Check interrupts state and process them as needed */
 static void
-cpu8051_CheckInterrupts(void)
+cpu8051_check_interrupts(void)
 {
        int i;
 
@@ -283,7 +284,7 @@ cpu8051_CheckInterrupts(void)
                        /* Interrupt timer 0 */
                        if (cpu8051_interrupt_enabled(INTERRUPT_1) &&
                            cpu8051_interrupt_fire(INTERRUPT_1, i) &&
-                            (cpu8051_ReadD(_TCON_) & 0x20)) {
+                           (cpu8051_ReadD(_TCON_) & 0x20)) {
                                cpu8051_WriteD(_TCON_,
                                               cpu8051_ReadD(_TCON_) & 0xDF);
                                cpu8051_process_interrupt(0x0B, i);
@@ -318,7 +319,7 @@ cpu8051_CheckInterrupts(void)
 
 /* Execute at address cpu8051.pc from PGMMem */
 int
-cpu8051_Exec(void)
+cpu8051_exec(void)
 {
        int i;
        int rc;
@@ -327,7 +328,7 @@ cpu8051_Exec(void)
 
        /* Basic address check (may fail later if opcode has operands). */
        rc = memory_check_address(PGM_MEM_ID, cpu8051.pc, DISPLAY_ERROR_NO);
-       if (rc == false) {
+       if (!rc) {
                log_err("Trying to run past program memory limit");
                return false; /* Error */
        }
@@ -345,7 +346,7 @@ cpu8051_Exec(void)
        gp_timers_increment(insttiming);
 
        for (i = 0; i < insttiming; i++) {
-               cpu8051_CheckInterrupts();
+               cpu8051_check_interrupts();
                timers_check();
                cpu8051.clock++;
        }
@@ -365,36 +366,36 @@ int
 cpu8051_run(int instr_count, int (*interface_stop)(void))
 {
        int rc;
-       int stop = false;
+       int run = true;
        int breakpoint_hit = false;
 
-       while (stop == false) {
-               rc = cpu8051_Exec();
-               if (rc == false)
-                       stop = true;
-               else {
+       while (run) {
+               rc = cpu8051_exec();
+               if (!rc) {
+                       run = false;
+               else {
                        if (instr_count > 0)
                                instr_count--;
 
                        if (instr_count == 0) {
-                               stop = true;
+                               run = false;
                                log_info("Number of instructions reached");
                        }
 
-                       if (IsBreakpoint(cpu8051.pc)) {
-                               stop = true;
+                       if (breakpoint_is_defined(cpu8051.pc)) {
+                               run = false;
                                breakpoint_hit = true;
                                log_info("Breakpoint hit at %.4X", cpu8051.pc);
                        }
 
-                       if (IsStoppoint(cpu8051.pc)) {
-                               stop = true;
+                       if (stop_point_is_defined(cpu8051.pc)) {
+                               run = false;
                                log_info("Stoppoint hit at %.4X", cpu8051.pc);
                        }
 
                        if (interface_stop != NULL) {
                                if (interface_stop()) {
-                                       stop = true;
+                                       run = false;
                                        log_info("Caught break signal");
                                }
                        }
@@ -441,42 +442,42 @@ cpu8051_run(int instr_count, int (*interface_stop)(void))
 
 /* Return as Text the name of the SFR register at Address if any */
 static int
-cpu8051_SFRMemInfo(unsigned int Address, char *Text)
+cpu8051_sfr_mem_info(unsigned int address, char *text)
 {
-       switch (Address) {
-       case 0x80: return sprintf(Text, "P0");
-       case 0x81: return sprintf(Text, "SP");
-       case 0x82: return sprintf(Text, "DPL");
-       case 0x83: return sprintf(Text, "DPH");
-       case 0x87: return sprintf(Text, "PCON");
-       case 0x88: return sprintf(Text, "TCON");
-       case 0x89: return sprintf(Text, "TMOD");
-       case 0x8A: return sprintf(Text, "TL0");
-       case 0x8B: return sprintf(Text, "TL1");
-       case 0x8C: return sprintf(Text, "TH0");
-       case 0x8D: return sprintf(Text, "TH1");
-       case 0x90: return sprintf(Text, "P1");
-       case 0x98: return sprintf(Text, "SCON");
-       case 0x99: return sprintf(Text, "SBUF");
-       case 0xA0: return sprintf(Text, "P2");
-       case 0xA8: return sprintf(Text, "IE");
-       case 0xB0: return sprintf(Text, "P3");
-       case 0xB8: return sprintf(Text, "IP");
-       case 0xC8: return sprintf(Text, "T2CON");
-       case 0xCA: return sprintf(Text, "RCAP2L");
-       case 0xCB: return sprintf(Text, "RCAP2H");
-       case 0xCC: return sprintf(Text, "TL2");
-       case 0xCD: return sprintf(Text, "TH2");
-       case 0xD0: return sprintf(Text, "PSW");
-       case 0xE0: return sprintf(Text, "ACC");
-       case 0xF0: return sprintf(Text, "B");
-       default: return sprintf(Text, "%.2XH", Address);
+       switch (address) {
+       case 0x80: return sprintf(text, "P0");
+       case 0x81: return sprintf(text, "SP");
+       case 0x82: return sprintf(text, "DPL");
+       case 0x83: return sprintf(text, "DPH");
+       case 0x87: return sprintf(text, "PCON");
+       case 0x88: return sprintf(text, "TCON");
+       case 0x89: return sprintf(text, "TMOD");
+       case 0x8A: return sprintf(text, "TL0");
+       case 0x8B: return sprintf(text, "TL1");
+       case 0x8C: return sprintf(text, "TH0");
+       case 0x8D: return sprintf(text, "TH1");
+       case 0x90: return sprintf(text, "P1");
+       case 0x98: return sprintf(text, "SCON");
+       case 0x99: return sprintf(text, "SBUF");
+       case 0xA0: return sprintf(text, "P2");
+       case 0xA8: return sprintf(text, "IE");
+       case 0xB0: return sprintf(text, "P3");
+       case 0xB8: return sprintf(text, "IP");
+       case 0xC8: return sprintf(text, "T2CON");
+       case 0xCA: return sprintf(text, "RCAP2L");
+       case 0xCB: return sprintf(text, "RCAP2H");
+       case 0xCC: return sprintf(text, "TL2");
+       case 0xCD: return sprintf(text, "TH2");
+       case 0xD0: return sprintf(text, "PSW");
+       case 0xE0: return sprintf(text, "ACC");
+       case 0xF0: return sprintf(text, "B");
+       default: return sprintf(text, "%.2XH", address);
        }
 }
 
-/* Return as Text the decoded BitAddress */
+/* Return as text the decoded bit address */
 static void
-cpu8051_IntMemBitInfo(uint8_t bit_address, char *text)
+cpu8051_int_mem_bit_info(uint8_t bit_address, char *text)
 {
        uint8_t byte_address;
        uint8_t bit_number;
@@ -484,7 +485,7 @@ cpu8051_IntMemBitInfo(uint8_t bit_address, char *text)
 
        cpu8051_convert_bit_address(bit_address, &byte_address, &bit_number);
 
-       len = cpu8051_SFRMemInfo(byte_address, text);
+       len = cpu8051_sfr_mem_info(byte_address, text);
        sprintf(&text[len], ".%X", bit_address);
 }
 
@@ -497,9 +498,9 @@ cpu8051_get_instruction_size(unsigned char opcode)
 
 /* Display instruction mnemonic. */
 void
-cpu8051_disasm_mnemonic(unsigned char OpCode, char *buf)
+cpu8051_disasm_mnemonic(unsigned char opcode, char *buf)
 {
-       sprintf(buf, "%s", InstTextTbl[InstTypesTbl[OpCode]]);
+       sprintf(buf, "%s", InstTextTbl[InstTypesTbl[opcode]]);
 }
 
 /* Disasm instruction arguments starting at address into a text string */
@@ -507,26 +508,26 @@ void
 cpu8051_disasm_args(unsigned int address, char *buf)
 {
        int len = 0;
-       char TextTmp[20];
-       unsigned char OpCode;
+       char str[20];
+       unsigned char opcode;
        int ArgTblOfs;
        int i;
 
-       OpCode = memory_read8(PGM_MEM_ID, address);
-       ArgTblOfs = OpCode << 2;
+       opcode = memory_read8(PGM_MEM_ID, address);
+       ArgTblOfs = opcode << 2;
        address++;
 
        /*
-        * MOV direct, direct (OpCode 85h) is peculiar, the operands
+        * MOV direct, direct (opcode 85h) is peculiar, the operands
         * are inverted
         */
-       if (OpCode == 0x85) {
-               cpu8051_SFRMemInfo(memory_read8(PGM_MEM_ID, address + 1),
-                                  TextTmp);
-               len += sprintf(&buf[len], "%s,", TextTmp);
-               cpu8051_SFRMemInfo(memory_read8(PGM_MEM_ID, address),
-                                  TextTmp);
-               len += sprintf(&buf[len], "%s", TextTmp);
+       if (opcode == 0x85) {
+               cpu8051_sfr_mem_info(memory_read8(PGM_MEM_ID, address + 1),
+                                    str);
+               len += sprintf(&buf[len], "%s,", str);
+               cpu8051_sfr_mem_info(memory_read8(PGM_MEM_ID, address),
+                                    str);
+               len += sprintf(&buf[len], "%s", str);
                address += 2;
                return;
        }
@@ -535,7 +536,7 @@ cpu8051_disasm_args(unsigned int address, char *buf)
                switch (InstArgTbl[ArgTblOfs + i]) {
                case ADDR11: {
                        len += sprintf(&buf[len],
-                                      "%.4XH", ((OpCode << 3) & 0xF00) +
+                                      "%.4XH", ((opcode << 3) & 0xF00) +
                                       (memory_read8(PGM_MEM_ID, address)));
                        address++;
                        break;
@@ -549,17 +550,17 @@ cpu8051_disasm_args(unsigned int address, char *buf)
                        break;
                }
                case DIRECT: {
-                       cpu8051_SFRMemInfo(memory_read8(PGM_MEM_ID, address),
-                                          TextTmp);
-                       len += sprintf(&buf[len], "%s", TextTmp);
+                       cpu8051_sfr_mem_info(memory_read8(PGM_MEM_ID, address),
+                                            str);
+                       len += sprintf(&buf[len], "%s", str);
                        address++;
                        break;
                }
                case BITADDR: {
-                       cpu8051_IntMemBitInfo(
+                       cpu8051_int_mem_bit_info(
                                (memory_read8(PGM_MEM_ID, address) & 0xF8),
-                               TextTmp);
-                       len += sprintf(&buf[len], "%s.%X" , TextTmp,
+                               str);
+                       len += sprintf(&buf[len], "%s.%X" , str,
                                       (memory_read8(PGM_MEM_ID, address) & 7));
                        address++;
                        break;
@@ -587,10 +588,10 @@ cpu8051_disasm_args(unsigned int address, char *buf)
                        break;
                }
                case CBITADDR: {
-                       cpu8051_IntMemBitInfo((memory_read8(PGM_MEM_ID,
-                                                           address) & 0xF8),
-                                             TextTmp);
-                       len += sprintf(&buf[len], "/%s.%X", TextTmp,
+                       cpu8051_int_mem_bit_info((memory_read8(PGM_MEM_ID,
+                                                              address) & 0xF8),
+                                                str);
+                       len += sprintf(&buf[len], "/%s.%X", str,
                                       (memory_read8(PGM_MEM_ID, address) & 7));
                        address++;
                        break;
@@ -605,132 +606,132 @@ cpu8051_disasm_args(unsigned int address, char *buf)
        }
 }
 
-/* Disasm one instruction at Address into a Text string */
+/* Disasm one instruction at address into a Text string */
 int
-cpu8051_Disasm(unsigned int Address, char *Text)
+cpu8051_disasm(unsigned int address, char *text)
 {
        int len = 0;
-       char TextTmp[20];
-       unsigned char OpCode;
+       char str[20];
+       unsigned char opcode;
        int ArgTblOfs;
-       int InstSize;
+       int inst_size;
        int i;
 
        /* Display address. */
-       len += sprintf(Text, " %.4X ", Address);
+       len += sprintf(text, " %.4X ", address);
 
-       OpCode = memory_read8(PGM_MEM_ID, Address);
-       InstSize = InstSizesTbl[OpCode];
+       opcode = memory_read8(PGM_MEM_ID, address);
+       inst_size = InstSizesTbl[opcode];
 
        /* Display hex bytes. */
-       for (i = 0; i < InstSize; i++)
-               len += sprintf(&Text[len], " %.2X",
-                                     memory_read8(PGM_MEM_ID, Address + i));
+       for (i = 0; i < inst_size; i++)
+               len += sprintf(&text[len], " %.2X",
+                              memory_read8(PGM_MEM_ID, address + i));
 
-       Address++;
+       address++;
 
        /* Padd remaining area with spaces. */
        for (; len < 17;)
-               len += sprintf(&Text[len], " ");
+               len += sprintf(&text[len], " ");
 
        /* Display instruction mnemonic. */
-       len += sprintf(&Text[len], "%s ",
-                             InstTextTbl[InstTypesTbl[OpCode]]);
-       ArgTblOfs = OpCode << 2;
+       len += sprintf(&text[len], "%s ",
+                      InstTextTbl[InstTypesTbl[opcode]]);
+       ArgTblOfs = opcode << 2;
 
        /* Padd remaining area with spaces. */
        for (; len < 25;)
-               len += sprintf(&Text[len], " ");
+               len += sprintf(&text[len], " ");
 
        /* Display instruction arguments. */
 
        /*
-        * MOV direct, direct (OpCode 85h) is peculiar, the operands
+        * MOV direct, direct (opcode 85h) is peculiar, the operands
         * are inverted
         */
-       if (OpCode == 0x85) {
-               cpu8051_SFRMemInfo(memory_read8(PGM_MEM_ID, Address + 1),
-                                  TextTmp);
-               len += sprintf(&Text[len], "%s,", TextTmp);
-               cpu8051_SFRMemInfo(memory_read8(PGM_MEM_ID, Address),
-                                  TextTmp);
-               len += sprintf(&Text[len], "%s", TextTmp);
-               Address += 2;
-               return InstSize;
+       if (opcode == 0x85) {
+               cpu8051_sfr_mem_info(memory_read8(PGM_MEM_ID, address + 1),
+                                    str);
+               len += sprintf(&text[len], "%s,", str);
+               cpu8051_sfr_mem_info(memory_read8(PGM_MEM_ID, address),
+                                    str);
+               len += sprintf(&text[len], "%s", str);
+               address += 2;
+               return inst_size;
        }
 
        for (i = 1; i <= InstArgTbl[ArgTblOfs]; i++) {
                switch (InstArgTbl[ArgTblOfs + i]) {
                case ADDR11: {
-                       len += sprintf(&Text[len],
-                                      "%.4XH", ((OpCode << 3) & 0xF00) +
-                                      (memory_read8(PGM_MEM_ID, Address)));
-                       Address++;
+                       len += sprintf(&text[len],
+                                      "%.4XH", ((opcode << 3) & 0xF00) +
+                                      (memory_read8(PGM_MEM_ID, address)));
+                       address++;
                        break;
                }
                case ADDR16: {
                        len += sprintf(
-                               &Text[len], "%.4XH",
-                               ((memory_read8(PGM_MEM_ID, Address) << 8) +
-                                memory_read8(PGM_MEM_ID, Address + 1)));
-                       Address += 2;
+                               &text[len], "%.4XH",
+                               ((memory_read8(PGM_MEM_ID, address) << 8) +
+                                memory_read8(PGM_MEM_ID, address + 1)));
+                       address += 2;
                        break;
                }
                case DIRECT: {
-                       cpu8051_SFRMemInfo(memory_read8(PGM_MEM_ID, Address),
-                                          TextTmp);
-                       len += sprintf(&Text[len], "%s", TextTmp);
-                       Address++;
+                       cpu8051_sfr_mem_info(memory_read8(PGM_MEM_ID, address),
+                                            str);
+                       len += sprintf(&text[len], "%s", str);
+                       address++;
                        break;
                }
                case BITADDR: {
-                       cpu8051_IntMemBitInfo(
-                               (memory_read8(PGM_MEM_ID, Address) & 0xF8),
-                               TextTmp);
-                       len += sprintf(&Text[len], "%s.%X" , TextTmp,
-                                      (memory_read8(PGM_MEM_ID, Address) & 7));
-                       Address++;
+                       cpu8051_int_mem_bit_info(
+                               (memory_read8(PGM_MEM_ID, address) & 0xF8),
+                               str);
+                       len += sprintf(&text[len], "%s.%X" , str,
+                                      (memory_read8(PGM_MEM_ID, address) & 7));
+                       address++;
                        break;
                }
                case RELADDR: {
-                       Address++;
-                       len += sprintf(&Text[len], "%.4XH", (Address & 0xFF00) +
-                                      (((Address & 0xFF) +
+                       address++;
+                       len += sprintf(&text[len], "%.4XH", (address & 0xFF00) +
+                                      (((address & 0xFF) +
                                         memory_read8(PGM_MEM_ID,
-                                                     Address - 1)) & 0xFF));
+                                                     address - 1)) & 0xFF));
                        break;
                }
                case DATAIMM: {
-                       len += sprintf(&Text[len], "#%.2XH",
-                                      memory_read8(PGM_MEM_ID, Address));
-                       Address++;
+                       len += sprintf(&text[len], "#%.2XH",
+                                      memory_read8(PGM_MEM_ID, address));
+                       address++;
                        break;
                }
                case DATA16: {
-                       len += sprintf(&Text[len], "#%.4XH",
+                       len += sprintf(&text[len], "#%.4XH",
                                       ((memory_read8(PGM_MEM_ID,
-                                                     Address) << 8) +
-                                       memory_read8(PGM_MEM_ID, Address+1)));
-                       Address += 2;
+                                                     address) << 8) +
+                                       memory_read8(PGM_MEM_ID, address+1)));
+                       address += 2;
                        break;
                }
                case CBITADDR: {
-                       cpu8051_IntMemBitInfo((memory_read8(PGM_MEM_ID,
-                                                           Address) & 0xF8),
-                                             TextTmp);
-                       len += sprintf(&Text[len], "/%s.%X", TextTmp,
-                                      (memory_read8(PGM_MEM_ID, Address) & 7));
-                       Address++;
+                       cpu8051_int_mem_bit_info((memory_read8(PGM_MEM_ID,
+                                                              address) & 0xF8),
+                                                str);
+                       len += sprintf(&text[len], "/%s.%X", str,
+                                      (memory_read8(PGM_MEM_ID, address) & 7));
+                       address++;
                        break;
                }
                default: {
-                       len += sprintf(&Text[len], "%s",
+                       len += sprintf(&text[len], "%s",
                                       ArgsTextTbl[InstArgTbl[ArgTblOfs + i]]);
                }
                }
                if (i < InstArgTbl[ArgTblOfs])
-                       len += sprintf(&Text[len], ",");
+                       len += sprintf(&text[len], ",");
        }
 
-       return InstSize;
+       return inst_size;
 }