diff options
author | Vas Crabb <vas@vastheman.com> | 2016-08-02 16:59:02 +1000 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2016-08-02 16:59:02 +1000 |
commit | 889ecdfd4f633aa9a868f69f10ed4fb2a427238c (patch) | |
tree | 892e43cc128118b948ba0fba414303ea82d39ddf /src/devices | |
parent | a26a40445beb13d0df877fa4e44093fb73c7703b (diff) |
Let's give the new srcclean a spin...
Diffstat (limited to 'src/devices')
27 files changed, 241 insertions, 241 deletions
diff --git a/src/devices/bus/apricot/keyboard/hle.h b/src/devices/bus/apricot/keyboard/hle.h index 139fa9da1c7..8ef520824a8 100644 --- a/src/devices/bus/apricot/keyboard/hle.h +++ b/src/devices/bus/apricot/keyboard/hle.h @@ -24,7 +24,7 @@ // ======================> apricot_keyboard_hle_device class apricot_keyboard_hle_device : public device_t, - public device_apricot_keyboard_interface, + public device_apricot_keyboard_interface, public device_buffered_serial_interface<16>, protected device_matrix_keyboard_interface<13> { diff --git a/src/devices/bus/apricot/keyboard/keyboard.h b/src/devices/bus/apricot/keyboard/keyboard.h index 577d2dee683..46398f30a3d 100644 --- a/src/devices/bus/apricot/keyboard/keyboard.h +++ b/src/devices/bus/apricot/keyboard/keyboard.h @@ -4,26 +4,26 @@ ACT Apricot Keyboard Interface - Host interface: 9-pin D-SUB - - 1 +12V - 2 OUT - 3 IN - 4 N/C - 5 N/C - 6 GND - 7 -12V - 8 0V - 9 N/C - - Keyboard interface: - - A 0V - B +12V - C -12V - D N/C - E OUT - F IN + Host interface: 9-pin D-SUB + + 1 +12V + 2 OUT + 3 IN + 4 N/C + 5 N/C + 6 GND + 7 -12V + 8 0V + 9 N/C + + Keyboard interface: + + A 0V + B +12V + C -12V + D N/C + E OUT + F IN ***************************************************************************/ diff --git a/src/devices/bus/nes/nes_pcb.hxx b/src/devices/bus/nes/nes_pcb.hxx index 10a3d35be33..e87a6d249a7 100644 --- a/src/devices/bus/nes/nes_pcb.hxx +++ b/src/devices/bus/nes/nes_pcb.hxx @@ -169,8 +169,8 @@ static const nes_pcb pcb_list[] = { "ks7031", KAISER_KS7031 }, // used in Dracula II (FDS Conversion) { "ks7012", KAISER_KS7012 }, // used in Zanac (FDS Conversion) { "ks7013b", KAISER_KS7013B }, // used in Highway Star (FDS Conversion) - { "ks7016", KAISER_KS7016 }, // used in Exciting Basketball (FDS Conversion) - { "ks7037", KAISER_KS7037 }, // Metroid FDS Chinese + { "ks7016", KAISER_KS7016 }, // used in Exciting Basketball (FDS Conversion) + { "ks7037", KAISER_KS7037 }, // Metroid FDS Chinese { "gs2015", RCM_GS2015 }, { "gs2004", RCM_GS2004 }, { "gs2013", RCM_GS2013 }, @@ -301,7 +301,7 @@ static const nes_pcb pcb_list[] = { "unl_bb", UNL_BB }, { "unl_malisb", UNL_MALISB }, { "sgpipe", BTL_SHUIGUAN }, - { "rt01", UNL_RT01 }, // Russian Test Cart + { "rt01", UNL_RT01 }, // Russian Test Cart { "unl_whero", UNL_WORLDHERO }, { "unl_43272", UNL_43272 }, { "tf1201", UNL_TF1201 }, @@ -322,12 +322,12 @@ static const nes_pcb pcb_list[] = { "a9746", UNSUPPORTED_BOARD }, { "dance2k", UNSUPPORTED_BOARD }, { "pec586", UNSUPPORTED_BOARD }, - { "bmc_f15", UNSUPPORTED_BOARD }, // 150-in-1 Unchained Melody - { "bmc_hp898f", UNSUPPORTED_BOARD }, // Primasoft 9999999-in-1 - { "bmc_8in1", UNSUPPORTED_BOARD }, // Super 8-in-1 (Incl. Rockin' Kats) - { "unl_eh8813a", UNSUPPORTED_BOARD }, // Dr. Mario II - { "unl_158b", UNSUPPORTED_BOARD }, // Blood of Jurassic - { "unl_drgnfgt", UNSUPPORTED_BOARD }, // Dragon Fighter by Flying Star + { "bmc_f15", UNSUPPORTED_BOARD }, // 150-in-1 Unchained Melody + { "bmc_hp898f", UNSUPPORTED_BOARD }, // Primasoft 9999999-in-1 + { "bmc_8in1", UNSUPPORTED_BOARD }, // Super 8-in-1 (Incl. Rockin' Kats) + { "unl_eh8813a", UNSUPPORTED_BOARD }, // Dr. Mario II + { "unl_158b", UNSUPPORTED_BOARD }, // Blood of Jurassic + { "unl_drgnfgt", UNSUPPORTED_BOARD }, // Dragon Fighter by Flying Star { "test", TEST_BOARD }, { "unknown", UNKNOWN_BOARD } // a few pirate dumps uses the wrong mapper... }; diff --git a/src/devices/bus/nes/nes_unif.hxx b/src/devices/bus/nes/nes_unif.hxx index 9f180e93d02..6c95ece3e41 100644 --- a/src/devices/bus/nes/nes_unif.hxx +++ b/src/devices/bus/nes/nes_unif.hxx @@ -137,15 +137,15 @@ static const unif unif_list[] = { "BMC-70IN1", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // mapper 236? { "BMC-70IN1B", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // mapper 236? { "BMC-42IN1RESETSWITCH", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // mapper 60? - { "BMC-F-15", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // 150-in-1 Unchained Melody - { "BMC-HP898F", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Primasoft 9999999-in-1 - { "BMC-8-IN-1", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Super 8-in-1 (Incl. Rockin' Kats) - { "UNL-EH8813A", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Dr. Mario II - { "UNL-158B", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Blood of Jurassic - { "UNL-DRAGONFIGHTER", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Dragon Fighter by Flying Star - { "UNL-KS7016", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Exciting Basketball FDS - { "UNL-KS7037", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Metroid FDS Chinese - { "UNL-RT-01", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Russian Test Cart + { "BMC-F-15", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // 150-in-1 Unchained Melody + { "BMC-HP898F", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Primasoft 9999999-in-1 + { "BMC-8-IN-1", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Super 8-in-1 (Incl. Rockin' Kats) + { "UNL-EH8813A", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Dr. Mario II + { "UNL-158B", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Blood of Jurassic + { "UNL-DRAGONFIGHTER", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Dragon Fighter by Flying Star + { "UNL-KS7016", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Exciting Basketball FDS + { "UNL-KS7037", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Metroid FDS Chinese + { "UNL-RT-01", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // Russian Test Cart { "PEC-586", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, { "UNL-DANCE", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, { "UNL-DRIPGAME", 0, 0, CHRRAM_0, UNSUPPORTED_BOARD}, // [by Quietust - we need more info] diff --git a/src/devices/bus/ti99x/990_hd.cpp b/src/devices/bus/ti99x/990_hd.cpp index 79d808bb390..6c6fdda6c5d 100644 --- a/src/devices/bus/ti99x/990_hd.cpp +++ b/src/devices/bus/ti99x/990_hd.cpp @@ -122,7 +122,7 @@ enum static const UINT16 w_mask[8] = { 0x000f, /* Controllers should prevent overwriting of w0 status bits, and I know - that some controllers do so. */ + that some controllers do so. */ 0xffff, 0xffff, 0xffff, diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp index a08b7690a35..dc2a927673a 100644 --- a/src/devices/bus/ti99x/990_tap.cpp +++ b/src/devices/bus/ti99x/990_tap.cpp @@ -72,7 +72,7 @@ enum static const UINT16 w_mask[8] = { 0x000f, /* Controllers should prevent overwriting of w0 status bits, and I know - that some controllers do so. */ + that some controllers do so. */ 0xffff, 0xffff, 0xffff, diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index fbfab9272e4..5dbe1e5c7bf 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -405,20 +405,20 @@ WRITE8_MEMBER(ws_rom_eeprom_device::write_io) switch (offset) { case 0x06: /* EEPROM address lower bits port/EEPROM address and command port - 1KBit EEPROM: - Bit 0-5 - EEPROM address bit 1-6 - Bit 6-7 - Command - 00 - Extended command address bit 4-5: - 00 - Write disable - 01 - Write all - 10 - Erase all - 11 - Write enable - 01 - Write - 10 - Read - 11 - Erase - 16KBit EEPROM: - Bit 0-7 - EEPROM address bit 1-8 - */ + 1KBit EEPROM: + Bit 0-5 - EEPROM address bit 1-6 + Bit 6-7 - Command + 00 - Extended command address bit 4-5: + 00 - Write disable + 01 - Write all + 10 - Erase all + 11 - Write enable + 01 - Write + 10 - Read + 11 - Erase + 16KBit EEPROM: + Bit 0-7 - EEPROM address bit 1-8 + */ switch (m_eeprom_mode) { case EEPROM_1K: @@ -440,23 +440,23 @@ WRITE8_MEMBER(ws_rom_eeprom_device::write_io) break; case 0x07: /* EEPROM higher bits/command bits port - 1KBit EEPROM: - Bit 0 - Start - Bit 1-7 - Unknown - 16KBit EEPROM: - Bit 0-1 - EEPROM address bit 9-10 - Bit 2-3 - Command - 00 - Extended command address bit 0-1: - 00 - Write disable - 01 - Write all - 10 - Erase all - 11 - Write enable - 01 - Write - 10 - Read - 11 - Erase - Bit 4 - Start - Bit 5-7 - Unknown - */ + 1KBit EEPROM: + Bit 0 - Start + Bit 1-7 - Unknown + 16KBit EEPROM: + Bit 0-1 - EEPROM address bit 9-10 + Bit 2-3 - Command + 00 - Extended command address bit 0-1: + 00 - Write disable + 01 - Write all + 10 - Erase all + 11 - Write enable + 01 - Write + 10 - Read + 11 - Erase + Bit 4 - Start + Bit 5-7 - Unknown + */ switch (m_eeprom_mode) { case EEPROM_1K: @@ -486,14 +486,14 @@ WRITE8_MEMBER(ws_rom_eeprom_device::write_io) break; case 0x08: /* EEPROM command - Bit 0 - Read complete (read only) - Bit 1 - Write complete (read only) - Bit 2-3 - Unknown - Bit 4 - Read - Bit 5 - Write - Bit 6 - Protect - Bit 7 - Initialize - */ + Bit 0 - Read complete (read only) + Bit 1 - Write complete (read only) + Bit 2-3 - Unknown + Bit 4 - Read + Bit 5 - Write + Bit 6 - Protect + Bit 7 - Initialize + */ if (data & 0x80) // Initialize logerror("Unsupported EEPROM command 'Initialize'\n"); diff --git a/src/devices/cpu/apexc/apexc.cpp b/src/devices/cpu/apexc/apexc.cpp index c39c6b0b418..56d29e65415 100644 --- a/src/devices/cpu/apexc/apexc.cpp +++ b/src/devices/cpu/apexc/apexc.cpp @@ -536,14 +536,14 @@ void apexc_cpu_device::execute() the 5 bits must be cleared initially, an OR kind of makes sense */ m_r |= papertape_read() << 27; delay2 = 32; /* no idea whether this should be counted as an absolute delay - or as a value in delay2 */ + or as a value in delay2 */ break; case 4: /* P */ papertape_punch((m_r >> 27) & 0x1f); delay2 = 32; /* no idea whether this should be counted as an absolute delay - or as a value in delay2 */ + or as a value in delay2 */ break; case 6: @@ -723,7 +723,7 @@ void apexc_cpu_device::execute() /* S(x) */ m_working_store = (x >> 5) & 0xf; /* or is it (x >> 6)? */ DELAY(32); /* no idea what the value is... All I know is that it takes much - more time than track switching (which takes 6 cycles) */ + more time than track switching (which takes 6 cycles) */ break; } if (vector) @@ -835,7 +835,7 @@ void apexc_cpu_device::device_reset() /* next two lines are just the product of my bold fantasy */ m_cr = 0; /* first instruction executed will be a stop */ m_running = TRUE; /* this causes the CPU to load the instruction at 0/0, - which enables easy booting (just press run on the panel) */ + which enables easy booting (just press run on the panel) */ m_a = 0; m_r = 0; m_pc = 0; diff --git a/src/devices/cpu/apexc/apexc.h b/src/devices/cpu/apexc/apexc.h index ad07fba71c6..e5634c3dcb1 100644 --- a/src/devices/cpu/apexc/apexc.h +++ b/src/devices/cpu/apexc/apexc.h @@ -16,8 +16,8 @@ enum APEXC_STATE, /* whether CPU is running */ APEXC_ML_FULL, /* read-only pseudo-register for exclusive use by the control panel code - in the apexc driver : enables it to get the complete address computed - from the contents of ML and WS */ + in the apexc driver : enables it to get the complete address computed + from the contents of ML and WS */ APEXC_PC /* doesn't actually exist; is there for the disassembler */ }; diff --git a/src/devices/cpu/i86/i186.cpp b/src/devices/cpu/i86/i186.cpp index 7d30f5b9771..6f26f9faabe 100644 --- a/src/devices/cpu/i86/i186.cpp +++ b/src/devices/cpu/i86/i186.cpp @@ -28,7 +28,7 @@ #define DEST_INCREMENT 0x2000 #define DEST_NO_CHANGE (DEST_DECREMENT | DEST_INCREMENT) #define DEST_INCDEC_MASK (DEST_DECREMENT | DEST_INCREMENT) -#define SRC_MIO 0X1000 +#define SRC_MIO 0x1000 #define SRC_DECREMENT 0x0800 #define SRC_INCREMENT 0x0400 #define SRC_NO_CHANGE (SRC_DECREMENT | SRC_INCREMENT) diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 3254f656f4e..6ccad0a03bd 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -254,8 +254,8 @@ public: write32_delegate cmpild_instr_callback; /* Called when a CMPI.L #v, Dn instruction is encountered */ write_line_delegate rte_instr_callback; /* Called when a RTE instruction is encountered */ write8_delegate tas_write_callback; /* Called instead of normal write8 by the TAS instruction, - allowing writeback to be disabled globally or selectively - or other side effects to be implemented */ + allowing writeback to be disabled globally or selectively + or other side effects to be implemented */ address_space *program, *oprogram; diff --git a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h index 5d3a1745f53..122211bc35a 100644 --- a/src/devices/cpu/patinhofeio/patinhofeio_cpu.h +++ b/src/devices/cpu/patinhofeio/patinhofeio_cpu.h @@ -76,14 +76,14 @@ protected: /* processor registers */ unsigned char m_acc; /* accumulator (8 bits) */ unsigned int m_pc; /* program counter (12 bits) - * Actual register name is CI, which - * stands for "Contador de Instrucao" - * or "instructions counter". - */ + * Actual register name is CI, which + * stands for "Contador de Instrucao" + * or "instructions counter". + */ unsigned int m_rc; /* RC = "Registrador de Chaves" (Keys Register) - * It represents the 12 bits of input data - * from toggle switches in the computer panel - */ + * It represents the 12 bits of input data + * from toggle switches in the computer panel + */ unsigned char m_idx; /* IDX = Index Register */ unsigned char m_ext; /* EXT = Accumulator Extension Register */ diff --git a/src/devices/cpu/pdp1/pdp1.cpp b/src/devices/cpu/pdp1/pdp1.cpp index dad758a1d9d..7489d974911 100644 --- a/src/devices/cpu/pdp1/pdp1.cpp +++ b/src/devices/cpu/pdp1/pdp1.cpp @@ -834,7 +834,7 @@ void pdp1_device::execute_run() } else if ((IR == DIO) || (IR == DAC)) /* dio or dac instruction ? */ { /* there is a discrepancy: the pdp1 handbook tells that only dio should be used, - but the lisp tape uses the dac instruction instead */ + but the lisp tape uses the dac instruction instead */ /* Yet maintenance manual p. 6-25 states clearly that the data is located in IO and transfered to MB, so DAC is likely to be a mistake. */ m_rim_step = 2; @@ -1122,9 +1122,9 @@ void pdp1_device::execute_instruction() } case SUB: /* Subtract */ { /* maintenance manual 7-14 seems to imply that substract does not test for -0. - The sim 2.3 source says so explicitely, though they do not give a reference. - It sounds a bit weird, but the reason is probably that doing so would - require additionnal logic that does not exist. */ + The sim 2.3 source says so explicitely, though they do not give a reference. + It sounds a bit weird, but the reason is probably that doing so would + require additionnal logic that does not exist. */ /* overflow is set if the 2 operands have the same sign and the final result has another */ int ov2; /* 1 if the operands have the same sign*/ diff --git a/src/devices/cpu/pdp1/tx0.cpp b/src/devices/cpu/pdp1/tx0.cpp index 8e5b41776a0..7a966a04e9d 100644 --- a/src/devices/cpu/pdp1/tx0.cpp +++ b/src/devices/cpu/pdp1/tx0.cpp @@ -465,7 +465,7 @@ void tx0_64kw_device::execute_instruction_64kw() { PC = MAR & ADDRESS_MASK_64KW; m_cycle = 0; /* instruction only takes one cycle if branch - is taken */ + is taken */ } break; @@ -596,18 +596,18 @@ void tx0_64kw_device::execute_instruction_64kw() if (MAR & 0000010) { /* (1.7) CRY = Partial add the 18 digits of the AC to the - corresponding 18 digits of the carry. + corresponding 18 digits of the carry. - To determine what the 18 digits of the carry are, use the - following rule: + To determine what the 18 digits of the carry are, use the + following rule: - "Grouping the AC and MBR digits into pairs and proceeding from - right to left, assign the carry digit of the next pair to a one - if in the present pair MBR = 1 and AC = 0 or if in the present - pair AC = 1 and carry 1. + "Grouping the AC and MBR digits into pairs and proceeding from + right to left, assign the carry digit of the next pair to a one + if in the present pair MBR = 1 and AC = 0 or if in the present + pair AC = 1 and carry 1. - (Note: the 0th digit pair determines the 17th pair's carry - digit)" */ + (Note: the 0th digit pair determines the 17th pair's carry + digit)" */ AC ^= MBR; AC = AC + MBR; @@ -666,7 +666,7 @@ void tx0_8kw_device::execute_instruction_8kw() { PC = MAR & 0017777; m_cycle = 0; /* instruction only takes one cycle if branch - is taken */ + is taken */ } break; @@ -675,7 +675,7 @@ void tx0_8kw_device::execute_instruction_8kw() { PC = MAR & 0017777; m_cycle = 0; /* instruction only takes one cycle if branch - is taken */ + is taken */ } break; @@ -683,7 +683,7 @@ void tx0_8kw_device::execute_instruction_8kw() XR = PC; PC = MAR & 0017777; m_cycle = 0; /* instruction only takes one cycle if branch - is taken */ + is taken */ break; case 19: /* Transfer and IndeX */ @@ -695,7 +695,7 @@ void tx0_8kw_device::execute_instruction_8kw() XR--; PC = MAR & 0017777; m_cycle = 0; /* instruction only takes one cycle if branch - is taken */ + is taken */ } break; @@ -704,7 +704,7 @@ void tx0_8kw_device::execute_instruction_8kw() case 20: /* TRAnsfer */ PC = MAR & 0017777; m_cycle = 0; /* instruction only takes one cycle if branch - is taken */ + is taken */ break; case 22: /* Transfer on external LeVel */ @@ -712,7 +712,7 @@ void tx0_8kw_device::execute_instruction_8kw() { PC = MAR & 0017777; m_cycle = 0;*/ /* instruction only takes one cycle if branch - is taken */ + is taken */ /*}*/ break; @@ -915,8 +915,8 @@ void tx0_8kw_device::execute_instruction_8kw() { /* Normal operate class instruction */ if (((IR & 001) == 00) && ((MAR & 017000) == 003000)) { /* (1.1) PEN = set ac bit 0 from light PEN ff, and ac bit 1 from - light gun ff. (ffs contain one if pen or gun saw displayed - point.) Then clear both light pen and light gun ffs */ + light gun ff. (ffs contain one if pen or gun saw displayed + point.) Then clear both light pen and light gun ffs */ /*AC = (AC & 0177777) |?...;*/ /*... = 0;*/ } @@ -985,12 +985,12 @@ void tx0_8kw_device::execute_instruction_8kw() switch (MAR & 0000300) { case 0000000: /* (1.6) CYR = CYcle ac contents Right one binary - position (AC(17) -> AC(0)) */ + position (AC(17) -> AC(0)) */ AC = (AC >> 1) | ((AC & 1) << 17); break; case 0000200: /* (1.6) CYcle ac contents Right one binary - position (AC(0) unchanged) */ + position (AC(0) unchanged) */ AC = (AC >> 1) | (AC & 0400000); break; @@ -1007,7 +1007,7 @@ void tx0_8kw_device::execute_instruction_8kw() if (MAR & 0000010) { /* (1.7?) CRY = Partial ADd the 18 digits of the AC to the - corresponding 18 digits of the carry. */ + corresponding 18 digits of the carry. */ AC ^= MBR; AC = AC + MBR; diff --git a/src/devices/cpu/sparc/sparcv8ops.ipp b/src/devices/cpu/sparc/sparcv8ops.ipp index 0bb8e9e675e..1f42c7b0cb2 100644 --- a/src/devices/cpu/sparc/sparcv8ops.ipp +++ b/src/devices/cpu/sparc/sparcv8ops.ipp @@ -16,49 +16,49 @@ void mb86901_device::execute_swap(UINT32 op) /* The SPARC Instruction Manual: Version 8, page 169, "Appendix C - ISP Descriptions - Atomic Load-Store Unsigned Byte Instructions" (SPARCv8.pdf, pg. 166) if (SWAP) then ( - address <- r[rs1] + (if (i = 0) then r[rs2] else sign_extend(simm13)); - addr_space <- (if (S = 0) then 10 else 11) + address <- r[rs1] + (if (i = 0) then r[rs2] else sign_extend(simm13)); + addr_space <- (if (S = 0) then 10 else 11) ) else if (SWAPA) then ( - if (S = 0) then ( - trap <- 1; - privileged_instruction <- 1 - ) else if (i = 1) then ( - trap <- 1; - illegal_instruction <- 1 - ) else ( - address <- r[rs1] + r[rs1]; - addr_space <- asi - ) + if (S = 0) then ( + trap <- 1; + privileged_instruction <- 1 + ) else if (i = 1) then ( + trap <- 1; + illegal_instruction <- 1 + ) else ( + address <- r[rs1] + r[rs1]; + addr_space <- asi + ) ); next; if (trap = 0) then ( - temp <- r[rd]; - while ( (pb_block_ldst_byte = 1) or (pb_block_ldst_word = 1) ) ( - { wait for lock(s) to be lifted } - { an implementation actually need only block when another SWAP is pending on - the same word in memory as the one addressed by this SWAP, or a LDSTUB is - pending on any byte of the word in memory addressed by this SWAP } - ); - next; - pb_block_ldst_word <- 1; - next; - (word, MAE) <- memory_read(addr_space, address); - next; - if (MAE = 1) then ( - trap <- 1; - data_access_exception = 1 - ) + temp <- r[rd]; + while ( (pb_block_ldst_byte = 1) or (pb_block_ldst_word = 1) ) ( + { wait for lock(s) to be lifted } + { an implementation actually need only block when another SWAP is pending on + the same word in memory as the one addressed by this SWAP, or a LDSTUB is + pending on any byte of the word in memory addressed by this SWAP } + ); + next; + pb_block_ldst_word <- 1; + next; + (word, MAE) <- memory_read(addr_space, address); + next; + if (MAE = 1) then ( + trap <- 1; + data_access_exception = 1 + ) next; if (trap = 0) then ( - MAE <- memory_write(addr_space, address, 1111, temp); - next; - pb_block_ldst_word <- 0; - if (MAE = 1) then ( { MAE = 1 only due to a "non-resumable machine-check error" } - trap <- 1; - data_access_exception <- 1 - ) else ( - if (rd != 0) then r[rd] <- word - ) + MAE <- memory_write(addr_space, address, 1111, temp); + next; + pb_block_ldst_word <- 0; + if (MAE = 1) then ( { MAE = 1 only due to a "non-resumable machine-check error" } + trap <- 1; + data_access_exception <- 1 + ) else ( + if (rd != 0) then r[rd] <- word + ) ); */ @@ -144,13 +144,13 @@ void mb86901_device::execute_mul(UINT32 op) else if (SMUL or SMULcc) then (Y, result) <- multiply_signed(r[rs1], operand2) next; if (rd != 0) then ( - r[rd] <- result; + r[rd] <- result; ) if (UMULcc or SMULcc) then ( - N <- result<31>; - Z <- if (result = 0) then 1 else 0; - V <- 0 - C <- 0 + N <- result<31>; + Z <- if (result = 0) then 1 else 0; + V <- 0 + C <- 0 ); */ @@ -195,42 +195,42 @@ void mb86901_device::execute_div(UINT32 op) next; if (operand2 = 0) then ( - trap <- 1; - division_by_zero <- 1 + trap <- 1; + division_by_zero <- 1 ) else ( - if (UDIV or UDIVcc) then ( - temp_64bit <- divide_unsigned(Y[]r[rs1], operand2); - next; - result <- temp_64bit<31:0>; - temp_V <- if (temp_64bit<63:32> = 0) then 0 else 1; - ) else if (SDIV or SDIVcc) then ( - temp_64bit <- divide_signed(Y[]r[rs1], operand2); - next; - result <- temp_64bit<31:0>; - temp_V <- if (temp_64bit<63:31> = 0) or - (temp_64bit<63:31> = (2^33 - 1)) ) then 0 else 1; - ) ; - next; - - if (temp_V) then ( - { result overflowed 32 bits; return largest appropriate integer } - if (UDIV or UDIVcc) then result <- 2^32 - 1; - else if (SDIV or SDIVcc) then ( - if (temp_64bit > 0) then result <- 2^31 - 1; - else result <- -2^31 - ) - ); - next; - - if (rd != 0) then ( - r[rd] <- result - ) ; - if (UDIVcc or SDIVcc) then ( - N <- result<31>; - Z <- if (result = 0) then 1 else 0; - V <- temp_V; - C <- 0 - ) + if (UDIV or UDIVcc) then ( + temp_64bit <- divide_unsigned(Y[]r[rs1], operand2); + next; + result <- temp_64bit<31:0>; + temp_V <- if (temp_64bit<63:32> = 0) then 0 else 1; + ) else if (SDIV or SDIVcc) then ( + temp_64bit <- divide_signed(Y[]r[rs1], operand2); + next; + result <- temp_64bit<31:0>; + temp_V <- if (temp_64bit<63:31> = 0) or + (temp_64bit<63:31> = (2^33 - 1)) ) then 0 else 1; + ) ; + next; + + if (temp_V) then ( + { result overflowed 32 bits; return largest appropriate integer } + if (UDIV or UDIVcc) then result <- 2^32 - 1; + else if (SDIV or SDIVcc) then ( + if (temp_64bit > 0) then result <- 2^31 - 1; + else result <- -2^31 + ) + ); + next; + + if (rd != 0) then ( + r[rd] <- result + ) ; + if (UDIVcc or SDIVcc) then ( + N <- result<31>; + Z <- if (result = 0) then 1 else 0; + V <- temp_V; + C <- 0 + ) ); */ diff --git a/src/devices/cpu/sparc/ss1fcode.ipp b/src/devices/cpu/sparc/ss1fcode.ipp index fa27713d143..bbe6eec23a9 100644 --- a/src/devices/cpu/sparc/ss1fcode.ipp +++ b/src/devices/cpu/sparc/ss1fcode.ipp @@ -11,7 +11,7 @@ void mb86901_device::log_fcodes() { if (PC != 0xffef0000 && PC != m_ss1_next_entry_point) return; - + if (PC == 0xffef0000) { UINT32 opcode = read_sized_word(11, REG(5), 2); @@ -31,7 +31,7 @@ void mb86901_device::log_fcodes() } //else if (opcode == 0x0cb8) //{ - // m_log_fcodes = false; + // m_log_fcodes = false; //} UINT32 handler_base = opcode << 2; handler_base += REG(2); // l1 = r2 + opcode << 2 @@ -64,7 +64,7 @@ void mb86901_device::indent() if (program_depth < 15) return; program_depth -= 15; - + for (int i = 0; i < program_depth; i++) { printf(" "); @@ -76,7 +76,7 @@ void mb86901_device::disassemble_ss1_fcode(UINT32 r5, UINT32 opcode, UINT32 hand std::string opdesc = m_ss1_fcode_table[opcode]; if (opdesc.length() == 0) opdesc = "[unknown]"; - + indent(); printf("\n"); indent(); printf("Stacks before this forth code:\n"); indent(); printf("Data Return\n"); @@ -130,7 +130,7 @@ void mb86901_device::disassemble_ss1_fcode(UINT32 r5, UINT32 opcode, UINT32 hand while (m_ss1_fcode_table[base_op].length() == 0) base_op--; UINT32 dist = (exact_op - base_op) * 4; - + if (entry_point == 0xffe87964) { indent(); printf("Opcode at %08x (%04x + %x): %04x, entry is at %08x // %s ; call %08x\n", r5, base_op, dist, opcode, entry_point, opdesc.c_str(), handler_base + 2); diff --git a/src/devices/cpu/tms9900/9900dasm.cpp b/src/devices/cpu/tms9900/9900dasm.cpp index b3c8bfb56dc..adf5affc0d6 100644 --- a/src/devices/cpu/tms9900/9900dasm.cpp +++ b/src/devices/cpu/tms9900/9900dasm.cpp @@ -51,7 +51,7 @@ enum /* processor set on which opcodes are available */ ps_any = 0x01, /* every processor in the tms9900/ti990 family */ ps_mapper = 0x02, /* processors with memory mapper (ti990/10, ti990/12, - and tms99000 with mapper coprocessor) */ + and tms99000 with mapper coprocessor) */ ps_tms9995 = 0x04, /* ti990/12, tms9995, and later */ ps_tms99000 = 0x08, /* ti990/12, tms99000, and later */ ps_ti990_12 = 0x10, /* ti990/12 only */ @@ -360,7 +360,7 @@ unsigned Dasm9900 (char *buffer, unsigned pc, int model_id, const UINT8 *oprom, if ((model_id == TI990_10_ID) /*|| (model_id == TI990_12_ID)*/ || (model_id >= TMS99000_ID)) processor_mask |= ps_mapper; /* processors with memory mapper (ti990/10, ti990/12, - and tms99000 with mapper coprocessor) */ + and tms99000 with mapper coprocessor) */ if (/*(model_id == TI990_12_ID) ||*/ (model_id >= TMS9995_ID)) processor_mask |= ps_tms9995; /* ti990/12, tms9995, and later */ diff --git a/src/devices/cpu/tms9900/99xxcore.h b/src/devices/cpu/tms9900/99xxcore.h index 6af39f91141..827e32dc5eb 100644 --- a/src/devices/cpu/tms9900/99xxcore.h +++ b/src/devices/cpu/tms9900/99xxcore.h @@ -466,7 +466,7 @@ struct tms99xx_state int icount; UINT8 IDLE; /* nonzero if processor is IDLE - i.e waiting for interrupt while writing - special data on CRU bus */ + special data on CRU bus */ #if HAS_MAPPING UINT8 mapping_on; /* set by a CRU write */ diff --git a/src/devices/machine/hdc92x4.cpp b/src/devices/machine/hdc92x4.cpp index 54a8f802b99..9579f33bf7c 100644 --- a/src/devices/machine/hdc92x4.cpp +++ b/src/devices/machine/hdc92x4.cpp @@ -242,7 +242,7 @@ enum { GEN_TIMER = 1, COM_TIMER /*, - LIVE_TIMER */ + LIVE_TIMER */ }; /* diff --git a/src/devices/machine/keyboard.cpp b/src/devices/machine/keyboard.cpp index 099767399f3..3d62e53bfad 100644 --- a/src/devices/machine/keyboard.cpp +++ b/src/devices/machine/keyboard.cpp @@ -31,13 +31,13 @@ WRITE8_MEMBER( xxx_state::kbd_put ) namespace { UINT8 const TRANSLATION_TABLE[][2][4][16] = { { - { // ANSI + { // ANSI { '`', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08U, 0x7fU, 0x1bU }, { 0x09U, 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\\', 0xffU, 0xffU }, { 0xffU, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', 0x0dU, 0xffU, 0xffU, 0x0aU }, { 0xffU, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0xffU, 0xffU, 0xffU, ' ' } }, - { // JIS + { // JIS { '\\', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '^', 0x08U, 0x7fU, 0x1bU }, { 0x09U, 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '@', '[', ']', 0xffU, 0xffU }, { 0xffU, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', ':', 0x0dU, 0xffU, 0xffU, 0x0aU }, @@ -45,13 +45,13 @@ UINT8 const TRANSLATION_TABLE[][2][4][16] = { } }, { - { // ANSI shift + { // ANSI shift { '~', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0x08U, 0x7fU, 0x1bU }, { 0x09U, 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '|', 0xffU, 0xffU }, { 0xffU, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', 0x0dU, 0xffU, 0xffU, 0x0aU }, { 0xffU, '_', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 0xffU, 0xffU, 0xffU, ' ' } }, - { // JIS shift + { // JIS shift { '|', '!', '"', '#', '$', '%', '&', '\'', '(', ')', 0xffU, '=', '~', 0x08U, 0x7fU, 0x1bU }, { 0x09U, 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '`', '{', '}', 0xffU, 0xffU }, { 0xffU, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', '+', '*', 0x0dU, 0xffU, 0xffU, 0x0aU }, @@ -59,13 +59,13 @@ UINT8 const TRANSLATION_TABLE[][2][4][16] = { } }, { - { // ANSI ctrl + { // ANSI ctrl { 0x00U, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0x1fU, 0x1eU, 0x08U, 0x7fU, 0x1bU }, { 0x09U, 0x11U, 0x17U, 0x05U, 0x12U, 0x14U, 0x19U, 0x15U, 0x09U, 0x0fU, 0x10U, 0x1bU, 0x1dU, 0x1cU, 0xffU, 0xffU }, { 0xffU, 0x01U, 0x13U, 0x04U, 0x06U, 0x07U, 0x08U, 0x0aU, 0x0bU, 0x0cU, ';', '\'', 0x0dU, 0xffU, 0xffU, 0x0aU }, { 0xffU, 0x1cU, 0x1aU, 0x18U, 0x03U, 0x16U, 0x02U, 0x0eU, 0x0dU, ',', '.', 0x1fU, 0xffU, 0xffU, 0xffU, 0x00U } }, - { // JIS ctrl + { // JIS ctrl { 0x1cU, '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0x1fU, 0x1eU, 0x08U, 0x7fU, 0x1bU }, { 0x09U, 0x11U, 0x17U, 0x05U, 0x12U, 0x14U, 0x19U, 0x15U, 0x09U, 0x0fU, 0x10U, 0x00U, 0x1bU, 0x1dU, 0xffU, 0xffU }, { 0xffU, 0x01U, 0x13U, 0x04U, 0x06U, 0x07U, 0x08U, 0x0aU, 0x0bU, 0x0cU, ';', ':', 0x0dU, 0xffU, 0xffU, 0x0aU }, @@ -180,7 +180,7 @@ INPUT_PORTS_START( generic_keyboard ) PORT_BIT( 0x0200U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O') PORT_BIT( 0x0400U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P') PORT_BIT( 0x0800U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x00) PORT_CHAR('[') PORT_CHAR('{') - PORT_BIT( 0x0800U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x01) PORT_CHAR('@') PORT_CHAR('`') + PORT_BIT( 0x0800U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x01) PORT_CHAR('@') PORT_CHAR('`') PORT_BIT( 0x1000U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x00) PORT_CHAR(']') PORT_CHAR('}') PORT_BIT( 0x1000U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x01) PORT_CHAR('[') PORT_CHAR('{') PORT_BIT( 0x2000U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x00) PORT_CHAR('\\') PORT_CHAR('|') @@ -202,7 +202,7 @@ INPUT_PORTS_START( generic_keyboard ) PORT_BIT( 0x0400U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x00) PORT_CHAR(';') PORT_CHAR(':') PORT_BIT( 0x0400U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x01) PORT_CHAR(';') PORT_CHAR('+') PORT_BIT( 0x0800U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x00) PORT_CHAR('\'') PORT_CHAR('"') - PORT_BIT( 0x0800U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x01) PORT_CHAR(':') PORT_CHAR('*') + PORT_BIT( 0x0800U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE) PORT_CONDITION("GENKBD_CFG", 0x01, EQUALS, 0x01) PORT_CHAR(':') PORT_CHAR('*') PORT_BIT( 0x1000U, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_NAME("Return") PORT_CHAR(0x0dU) PORT_BIT( 0x2000U, IP_ACTIVE_HIGH, IPT_UNUSED ) PORT_BIT( 0x4000U, IP_ACTIVE_HIGH, IPT_UNUSED ) diff --git a/src/devices/sound/okim6258.h b/src/devices/sound/okim6258.h index ecb5e8938c5..2e8d6f1891c 100644 --- a/src/devices/sound/okim6258.h +++ b/src/devices/sound/okim6258.h @@ -87,7 +87,7 @@ private: sound_stream *m_stream; /* which stream are we playing on? */ UINT8 m_output_bits; /* D/A precision is 10-bits but 12-bit data can be - output serially to an external DAC */ + output serially to an external DAC */ INT32 m_signal; INT32 m_step; diff --git a/src/devices/sound/sn76477.h b/src/devices/sound/sn76477.h index 849229c22d7..ed83fb7aa80 100644 --- a/src/devices/sound/sn76477.h +++ b/src/devices/sound/sn76477.h @@ -172,8 +172,8 @@ public: /* these functions take a capacitor value in Farads or the voltage on it in Volts */ #define SN76477_EXTERNAL_VOLTAGE_DISCONNECT (-1.0) /* indicates that the voltage is internally computed, - can be used in all the functions that take a - voltage on a capacitor */ + can be used in all the functions that take a + voltage on a capacitor */ void one_shot_cap_w(double data); void one_shot_cap_voltage_w(double data); void slf_cap_w(double data); diff --git a/src/devices/sound/spu.cpp b/src/devices/sound/spu.cpp index 4a14123c40d..3f8c9fe5bd6 100644 --- a/src/devices/sound/spu.cpp +++ b/src/devices/sound/spu.cpp @@ -140,13 +140,13 @@ static const unsigned int /*sound_buffer_size=65536*4,*/ output_buffer_size=65536/8/*, - sample_loop_cache_pool_size=64, - sample_loop_cache_extend_size=64, - sample_cache_pool_size=64, - sample_cache_extend_size=64, + sample_loop_cache_pool_size=64, + sample_loop_cache_extend_size=64, + sample_cache_pool_size=64, + sample_cache_extend_size=64, - stream_marker_pool_size=64, - stream_marker_extend_size=64*/; + stream_marker_pool_size=64, + stream_marker_extend_size=64*/; // // diff --git a/src/devices/sound/ymdeltat.h b/src/devices/sound/ymdeltat.h index 8ba599f42c3..2786f527a38 100644 --- a/src/devices/sound/ymdeltat.h +++ b/src/devices/sound/ymdeltat.h @@ -43,12 +43,12 @@ struct YM_DELTAT { /* AT: rearranged and tigntened structure */ UINT8 portstate; /* port status */ UINT8 control2; /* control reg: SAMPLE, DA/AD, RAM TYPE (x8bit / x1bit), ROM/RAM */ UINT8 portshift; /* address bits shift-left: - ** 8 for YM2610, - ** 5 for Y8950 and YM2608 */ + ** 8 for YM2610, + ** 5 for Y8950 and YM2608 */ UINT8 DRAMportshift; /* address bits shift-right: - ** 0 for ROM and x8bit DRAMs, - ** 3 for x1 DRAMs */ + ** 0 for ROM and x8bit DRAMs, + ** 3 for x1 DRAMs */ UINT8 memread; /* needed for reading/writing external memory */ diff --git a/src/devices/video/hd44780.h b/src/devices/video/hd44780.h index 5c2797e83e6..9e7ff763eac 100644 --- a/src/devices/video/hd44780.h +++ b/src/devices/video/hd44780.h @@ -70,14 +70,14 @@ protected: { CHARSET_HD44780_A00, CHARSET_KS0066_F05 /*, - CHARSET_HD44780_A01, - CHARSET_HD44780_A02, - CHARSET_KS0066_F00, - CHARSET_KS0066_F03, - CHARSET_KS0066_F04, - CHARSET_KS0066_F06, - CHARSET_KS0066_F59 - */ + CHARSET_HD44780_A01, + CHARSET_HD44780_A02, + CHARSET_KS0066_F00, + CHARSET_KS0066_F03, + CHARSET_KS0066_F04, + CHARSET_KS0066_F06, + CHARSET_KS0066_F59 + */ }; void set_charset_type(int type); diff --git a/src/devices/video/huc6202.cpp b/src/devices/video/huc6202.cpp index 24a409da420..bbe29e2ade0 100644 --- a/src/devices/video/huc6202.cpp +++ b/src/devices/video/huc6202.cpp @@ -94,10 +94,10 @@ READ16_MEMBER( huc6202_device::next_pixel ) break; case 2: /* Back - BG0 + SP1 => BG0 - Front - BG0 + BG1 => BG0 - BG1 + SP0 => BG1 - SP0 + SP1 => SP0 - */ + BG0 + BG1 => BG0 + BG1 + SP0 => BG1 + SP0 + SP1 => SP0 + */ if ( data_1 > huc6270_device::HUC6270_SPRITE ) { if ( data_0 > huc6270_device::HUC6270_SPRITE ) diff --git a/src/devices/video/snes_ppu.h b/src/devices/video/snes_ppu.h index 5305b5f800d..cc1f2a3311d 100644 --- a/src/devices/video/snes_ppu.h +++ b/src/devices/video/snes_ppu.h @@ -190,7 +190,7 @@ public: UINT8 m_bg3_priority_bit; UINT8 m_direct_color; UINT8 m_ppu_last_scroll; /* as per Anomie's doc and Theme Park, all scroll regs shares (but mode 7 ones) the same - 'previous' scroll value */ + 'previous' scroll value */ UINT8 m_mode7_last_scroll; /* as per Anomie's doc mode 7 scroll regs use a different value, shared with mode 7 matrix! */ UINT8 m_ppu1_open_bus, m_ppu2_open_bus; |