diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/devices/cpu/tms32025/tms32025.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/devices/cpu/tms32025/tms32025.cpp')
-rw-r--r-- | src/devices/cpu/tms32025/tms32025.cpp | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/src/devices/cpu/tms32025/tms32025.cpp b/src/devices/cpu/tms32025/tms32025.cpp index 9acc4a31f8c..e9226c86165 100644 --- a/src/devices/cpu/tms32025/tms32025.cpp +++ b/src/devices/cpu/tms32025/tms32025.cpp @@ -799,14 +799,14 @@ void tms32025_device::cnfd() /** next two fetches need to use previous CNF valu CLR1(CNF0_REG); m_datamap[4] = &m_intRAM[0x200]; /* B0 */ m_datamap[5] = &m_intRAM[0x280]; /* B0 */ - m_pgmmap[510] = NULL; - m_pgmmap[511] = NULL; + m_pgmmap[510] = nullptr; + m_pgmmap[511] = nullptr; } void tms32025_device::cnfp() /** next two fetches need to use previous CNF value ! **/ { SET1(CNF0_REG); - m_datamap[4] = NULL; /* B0 */ - m_datamap[5] = NULL; /* B0 */ + m_datamap[4] = nullptr; /* B0 */ + m_datamap[5] = nullptr; /* B0 */ m_pgmmap[510] = &m_intRAM[0x200]; m_pgmmap[511] = &m_intRAM[0x280]; } @@ -827,25 +827,25 @@ void tms32025_device::conf() /** Need to reconfigure the memory blocks */ m_datamap[13] = &m_intRAM[0x680]; /* B3 */ m_datamap[14] = &m_intRAM[0x700]; /* B3 */ m_datamap[15] = &m_intRAM[0x780]; /* B3 */ - m_pgmmap[500] = NULL; - m_pgmmap[501] = NULL; - m_pgmmap[502] = NULL; - m_pgmmap[503] = NULL; - m_pgmmap[504] = NULL; - m_pgmmap[505] = NULL; - m_pgmmap[506] = NULL; - m_pgmmap[507] = NULL; - m_pgmmap[508] = NULL; - m_pgmmap[509] = NULL; - m_pgmmap[510] = NULL; - m_pgmmap[511] = NULL; + m_pgmmap[500] = nullptr; + m_pgmmap[501] = nullptr; + m_pgmmap[502] = nullptr; + m_pgmmap[503] = nullptr; + m_pgmmap[504] = nullptr; + m_pgmmap[505] = nullptr; + m_pgmmap[506] = nullptr; + m_pgmmap[507] = nullptr; + m_pgmmap[508] = nullptr; + m_pgmmap[509] = nullptr; + m_pgmmap[510] = nullptr; + m_pgmmap[511] = nullptr; break; case 01: CLR1(CNF1_REG); SET1(CNF0_REG); - m_datamap[4] = NULL; - m_datamap[5] = NULL; - m_datamap[6] = NULL; - m_datamap[7] = NULL; + m_datamap[4] = nullptr; + m_datamap[5] = nullptr; + m_datamap[6] = nullptr; + m_datamap[7] = nullptr; m_datamap[8] = &m_intRAM[0x400]; /* B1 */ m_datamap[9] = &m_intRAM[0x480]; /* B1 */ m_datamap[10] = &m_intRAM[0x500]; /* B1 */ @@ -858,25 +858,25 @@ void tms32025_device::conf() /** Need to reconfigure the memory blocks */ m_pgmmap[501] = &m_intRAM[0x280]; /* B0 */ m_pgmmap[502] = &m_intRAM[0x300]; /* B0 */ m_pgmmap[503] = &m_intRAM[0x380]; /* B0 */ - m_pgmmap[504] = NULL; - m_pgmmap[505] = NULL; - m_pgmmap[506] = NULL; - m_pgmmap[507] = NULL; - m_pgmmap[508] = NULL; - m_pgmmap[509] = NULL; - m_pgmmap[510] = NULL; - m_pgmmap[511] = NULL; + m_pgmmap[504] = nullptr; + m_pgmmap[505] = nullptr; + m_pgmmap[506] = nullptr; + m_pgmmap[507] = nullptr; + m_pgmmap[508] = nullptr; + m_pgmmap[509] = nullptr; + m_pgmmap[510] = nullptr; + m_pgmmap[511] = nullptr; break; case 02: SET1(CNF1_REG); CLR1(CNF0_REG); - m_datamap[4] = NULL; - m_datamap[5] = NULL; - m_datamap[6] = NULL; - m_datamap[7] = NULL; - m_datamap[8] = NULL; - m_datamap[9] = NULL; - m_datamap[10] = NULL; - m_datamap[11] = NULL; + m_datamap[4] = nullptr; + m_datamap[5] = nullptr; + m_datamap[6] = nullptr; + m_datamap[7] = nullptr; + m_datamap[8] = nullptr; + m_datamap[9] = nullptr; + m_datamap[10] = nullptr; + m_datamap[11] = nullptr; m_datamap[12] = &m_intRAM[0x600]; /* B3 */ m_datamap[13] = &m_intRAM[0x680]; /* B3 */ m_datamap[14] = &m_intRAM[0x700]; /* B3 */ @@ -889,25 +889,25 @@ void tms32025_device::conf() /** Need to reconfigure the memory blocks */ m_pgmmap[505] = &m_intRAM[0x480]; /* B1 */ m_pgmmap[506] = &m_intRAM[0x500]; /* B1 */ m_pgmmap[507] = &m_intRAM[0x580]; /* B1 */ - m_pgmmap[508] = NULL; - m_pgmmap[509] = NULL; - m_pgmmap[510] = NULL; - m_pgmmap[511] = NULL; + m_pgmmap[508] = nullptr; + m_pgmmap[509] = nullptr; + m_pgmmap[510] = nullptr; + m_pgmmap[511] = nullptr; break; case 03: SET1(CNF1_REG); SET1(CNF0_REG); - m_datamap[4] = NULL; - m_datamap[5] = NULL; - m_datamap[6] = NULL; - m_datamap[7] = NULL; - m_datamap[8] = NULL; - m_datamap[9] = NULL; - m_datamap[10] = NULL; - m_datamap[11] = NULL; - m_datamap[12] = NULL; - m_datamap[13] = NULL; - m_datamap[14] = NULL; - m_datamap[15] = NULL; + m_datamap[4] = nullptr; + m_datamap[5] = nullptr; + m_datamap[6] = nullptr; + m_datamap[7] = nullptr; + m_datamap[8] = nullptr; + m_datamap[9] = nullptr; + m_datamap[10] = nullptr; + m_datamap[11] = nullptr; + m_datamap[12] = nullptr; + m_datamap[13] = nullptr; + m_datamap[14] = nullptr; + m_datamap[15] = nullptr; m_pgmmap[500] = &m_intRAM[0x200]; /* B0 */ m_pgmmap[501] = &m_intRAM[0x280]; /* B0 */ m_pgmmap[502] = &m_intRAM[0x300]; /* B0 */ @@ -2187,7 +2187,7 @@ bool tms32025_device::memory_readop(offs_t offset, int size, UINT64 &value) ****************************************************************************/ bool tms32025_device::memory_read(address_spacenum spacenum, offs_t offset, int size, UINT64 &value) { - void *ptr = NULL; + void *ptr = nullptr; UINT64 temp = 0; switch (spacenum) @@ -2239,7 +2239,7 @@ bool tms32025_device::memory_read(address_spacenum spacenum, offs_t offset, int ****************************************************************************/ bool tms32025_device::memory_write(address_spacenum spacenum, offs_t offset, int size, UINT64 value) { - void *ptr = NULL; + void *ptr = nullptr; switch (spacenum) { |