diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/arm7/arm7.c | 28 | ||||
| -rw-r--r-- | src/emu/cpu/arm7/arm7core.c | 4 | ||||
| -rw-r--r-- | src/emu/cpu/arm7/arm7core.h | 4 | ||||
| -rw-r--r-- | src/emu/cpu/i386/i386op16.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/i386/pentops.c | 2 | ||||
| -rw-r--r-- | src/emu/diimage.c | 10 | ||||
| -rw-r--r-- | src/emu/drawgfxm.h | 12 | ||||
| -rw-r--r-- | src/emu/machine/s3c24xx.c | 2 | ||||
| -rw-r--r-- | src/emu/machine/scsihd.c | 2 | ||||
| -rw-r--r-- | src/emu/rendutil.c | 2 | ||||
| -rw-r--r-- | src/emu/screen.c | 2 | ||||
| -rw-r--r-- | src/emu/tilemap.c | 4 | ||||
| -rw-r--r-- | src/emu/uiswlist.c | 4 | ||||
| -rw-r--r-- | src/emu/video/pc_vga.c | 16 |
14 files changed, 47 insertions, 47 deletions
diff --git a/src/emu/cpu/arm7/arm7.c b/src/emu/cpu/arm7/arm7.c index 09e42561faf..fcea2197747 100644 --- a/src/emu/cpu/arm7/arm7.c +++ b/src/emu/cpu/arm7/arm7.c @@ -307,7 +307,7 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) LOG( ( "ARM7: Translation fault on unmapped virtual address, PC = %08x, vaddr = %08x\n", R15, vaddr ) ); cpustate->pendingAbtP = 1; } - return FALSE; + return FALSE; break; case COPRO_TLB_COARSE_TABLE: // Entry is the physical address of a coarse second-level table @@ -323,9 +323,9 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) case COPRO_TLB_SECTION_TABLE: { // Entry is a section - UINT8 ap = (desc_lvl1 >> 10) & 3; - int fault = detect_fault( cpustate, permission, ap, flags); - if (fault == FAULT_NONE) + UINT8 ap = (desc_lvl1 >> 10) & 3; + int fault = detect_fault( cpustate, permission, ap, flags); + if (fault == FAULT_NONE) { paddr = ( desc_lvl1 & COPRO_TLB_SECTION_PAGE_MASK ) | ( vaddr & ~COPRO_TLB_SECTION_PAGE_MASK ); } @@ -334,12 +334,12 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) if (flags & ARM7_TLB_ABORT_D) { LOG( ( "ARM7: Section Table, Section %s fault on virtual address, vaddr = %08x, PC = %08x\n", (fault == FAULT_DOMAIN) ? "domain" : "permission", vaddr, R15 ) ); - COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (9 << 0) : (13 << 0)) | (domain << 4); // 9 = section domain fault, 13 = section permission fault + COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (9 << 0) : (13 << 0)) | (domain << 4); // 9 = section domain fault, 13 = section permission fault COPRO_FAULT_ADDRESS = vaddr; cpustate->pendingAbtD = 1; - LOG( ( "vaddr %08X desc_lvl1 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", - vaddr, desc_lvl1, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, - GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); + LOG( ( "vaddr %08X desc_lvl1 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", + vaddr, desc_lvl1, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, + GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); } else if (flags & ARM7_TLB_ABORT_P) { @@ -389,7 +389,7 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) UINT8 ap = ((((desc_lvl2 >> 4) & 0xFF) >> (((vaddr >> 10) & 3) << 1)) & 3); int fault = detect_fault( cpustate, permission, ap, flags); if (fault == FAULT_NONE) - { + { paddr = ( desc_lvl2 & COPRO_TLB_SMALL_PAGE_MASK ) | ( vaddr & ~COPRO_TLB_SMALL_PAGE_MASK ); } else @@ -398,12 +398,12 @@ INLINE int arm7_tlb_translate(arm_state *cpustate, UINT32 *addr, int flags) { // hapyfish expects a data abort when something tries to write to a read-only memory location from user mode LOG( ( "ARM7: Page Table, Section %s fault on virtual address, vaddr = %08x, PC = %08x\n", (fault == FAULT_DOMAIN) ? "domain" : "permission", vaddr, R15 ) ); - COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (11 << 0) : (15 << 0)) | (domain << 4); // 11 = page domain fault, 15 = page permission fault - COPRO_FAULT_ADDRESS = vaddr; + COPRO_FAULT_STATUS_D = ((fault == FAULT_DOMAIN) ? (11 << 0) : (15 << 0)) | (domain << 4); // 11 = page domain fault, 15 = page permission fault + COPRO_FAULT_ADDRESS = vaddr; cpustate->pendingAbtD = 1; - LOG( ( "vaddr %08X desc_lvl2 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", - vaddr, desc_lvl2, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, - GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); + LOG( ( "vaddr %08X desc_lvl2 %08X domain %d permission %d ap %d s %d r %d mode %d read %d write %d\n", + vaddr, desc_lvl2, domain, permission, ap, (COPRO_CTRL & COPRO_CTRL_SYSTEM) ? 1 : 0, (COPRO_CTRL & COPRO_CTRL_ROM) ? 1 : 0, + GET_MODE, flags & ARM7_TLB_READ ? 1 : 0, flags & ARM7_TLB_WRITE ? 1 : 0) ); } else if (flags & ARM7_TLB_ABORT_P) { diff --git a/src/emu/cpu/arm7/arm7core.c b/src/emu/cpu/arm7/arm7core.c index f75f554de41..0ed7d332a14 100644 --- a/src/emu/cpu/arm7/arm7core.c +++ b/src/emu/cpu/arm7/arm7core.c @@ -816,8 +816,8 @@ static void HandleCoProcRT(arm_state *cpustate, UINT32 insn) { UINT32 res = arm7_coproc_rt_r_callback(cpustate->device, insn, 0); // RT Read handler must parse opcode & return appropriate result if (cpustate->pendingUnd == 0) - { - SET_REGISTER(cpustate, (insn >> 12) & 0xf, res); + { + SET_REGISTER(cpustate, (insn >> 12) & 0xf, res); } } else diff --git a/src/emu/cpu/arm7/arm7core.h b/src/emu/cpu/arm7/arm7core.h index 80e31e2b58d..77360f8cca1 100644 --- a/src/emu/cpu/arm7/arm7core.h +++ b/src/emu/cpu/arm7/arm7core.h @@ -139,8 +139,8 @@ enum #define COPRO_DOMAIN_ACCESS_CONTROL cpustate->domainAccessControl -#define COPRO_FAULT_STATUS_D cpustate->faultStatus[0] -#define COPRO_FAULT_STATUS_P cpustate->faultStatus[1] +#define COPRO_FAULT_STATUS_D cpustate->faultStatus[0] +#define COPRO_FAULT_STATUS_P cpustate->faultStatus[1] #define COPRO_FAULT_ADDRESS cpustate->faultAddress diff --git a/src/emu/cpu/i386/i386op16.c b/src/emu/cpu/i386/i386op16.c index 7dbaa84e543..4e3def04992 100644 --- a/src/emu/cpu/i386/i386op16.c +++ b/src/emu/cpu/i386/i386op16.c @@ -3288,7 +3288,7 @@ static void I386OP(lar_r16_rm16)(i386_state *cpustate) // Opcode 0x0f 0x02 if(seg.selector == 0) { SetZF(0); // not a valid segment - // logerror("i386 (%08x): LAR: Selector %04x is invalid type.\n",cpustate->pc,seg.selector); + // logerror("i386 (%08x): LAR: Selector %04x is invalid type.\n",cpustate->pc,seg.selector); } else { diff --git a/src/emu/cpu/i386/pentops.c b/src/emu/cpu/i386/pentops.c index 09178890c29..52307b63219 100644 --- a/src/emu/cpu/i386/pentops.c +++ b/src/emu/cpu/i386/pentops.c @@ -85,4 +85,4 @@ static void PENTIUMOP(sse_group0fae)(i386_state *cpustate) // Opcode 0x0f ae static void PENTIUMOP(ud2)(i386_state *cpustate) // Opcode 0x0f 0b { i386_trap(cpustate, 6, 0, 0); -}
\ No newline at end of file +} diff --git a/src/emu/diimage.c b/src/emu/diimage.c index fee67bceb2a..c063c17977c 100644 --- a/src/emu/diimage.c +++ b/src/emu/diimage.c @@ -1046,7 +1046,7 @@ public: virtual ~ui_menu_control_device_image(); virtual void populate(); virtual void handle(); - + private: enum { START_FILE, START_OTHER_PART, START_SOFTLIST, SELECT_PARTLIST, SELECT_ONE_PART, SELECT_OTHER_PART, SELECT_FILE, CREATE_FILE, CREATE_CONFIRM, DO_CREATE, SELECT_SOFTLIST @@ -1241,7 +1241,7 @@ void ui_menu_control_device_image::handle() software_list_close(swl); state = SELECT_SOFTLIST; break; - + } break; @@ -1261,7 +1261,7 @@ void ui_menu_control_device_image::handle() case -1: // return to system ui_menu::stack_pop(machine()); break; - + } break; @@ -1306,12 +1306,12 @@ void ui_menu_control_device_image::handle() int err = image->create(path, 0, NULL); if (err != 0) popmessage("Error: %s", image->error()); - ui_menu::stack_pop(machine()); + ui_menu::stack_pop(machine()); } } else { state = START_FILE; handle(); - } + } break; } diff --git a/src/emu/drawgfxm.h b/src/emu/drawgfxm.h index 617c641d2f7..b85668b94da 100644 --- a/src/emu/drawgfxm.h +++ b/src/emu/drawgfxm.h @@ -1097,7 +1097,7 @@ do { \ { \ PRIORITY_TYPE *priptr = PRIORITY_ADDR(priority, PRIORITY_TYPE, cury, cliprect.min_x); \ PIXEL_TYPE *destptr = &dest.pix<PIXEL_TYPE>(cury, cliprect.min_x); \ - const PIXEL_TYPE *srcptr = &src.pix<PIXEL_TYPE>(starty >> 16); \ + const PIXEL_TYPE *srcptr = &src.pix<PIXEL_TYPE>(starty >> 16); \ INT32 srcx = startx; \ \ starty = (starty + incyy) & srcfixheight; \ @@ -1156,7 +1156,7 @@ do { \ { \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[0], priptr[0], srcptr[0]); \ } \ srcx += incxx; \ @@ -1164,7 +1164,7 @@ do { \ \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[1], priptr[1], srcptr[0]); \ } \ srcx += incxx; \ @@ -1172,7 +1172,7 @@ do { \ \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[2], priptr[2], srcptr[0]); \ } \ srcx += incxx; \ @@ -1180,7 +1180,7 @@ do { \ \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[3], priptr[3], srcptr[0]); \ } \ srcx += incxx; \ @@ -1195,7 +1195,7 @@ do { \ { \ if ((UINT32)srcx < srcfixwidth && (UINT32)srcy < srcfixheight) \ { \ - srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ + srcptr = &src.pix<PIXEL_TYPE>(srcy >> 16, srcx >> 16); \ PIXEL_OP(destptr[0], priptr[0], srcptr[0]); \ } \ srcx += incxx; \ diff --git a/src/emu/machine/s3c24xx.c b/src/emu/machine/s3c24xx.c index 180b31bacd6..5c778d3db2e 100644 --- a/src/emu/machine/s3c24xx.c +++ b/src/emu/machine/s3c24xx.c @@ -2107,7 +2107,7 @@ static READ32_DEVICE_HANDLER( s3c24xx_usb_host_r ) // HcRhStatus case 0x50 / 4: { - data = data & ~(1 << 16); // "The Root Hub does not support the local power status feature; thus, this bit is always read as ‘0’." + data = data & ~(1 << 16); // "The Root Hub does not support the local power status feature; thus, this bit is always read as ?0?." } break; } diff --git a/src/emu/machine/scsihd.c b/src/emu/machine/scsihd.c index f58776ec3ec..a5da6e39a2f 100644 --- a/src/emu/machine/scsihd.c +++ b/src/emu/machine/scsihd.c @@ -267,7 +267,7 @@ static void scsihd_alloc_instance( SCSIInstance *scsiInstance, const char *diskr our_this->disk = device->subdevice<harddisk_image_device>(diskregion)->get_hard_disk_file(); } } - + if (!our_this->disk) { our_this->is_file = FALSE; diff --git a/src/emu/rendutil.c b/src/emu/rendutil.c index c4bc491fa64..ac4a1e806c1 100644 --- a/src/emu/rendutil.c +++ b/src/emu/rendutil.c @@ -632,7 +632,7 @@ void render_load_png(bitmap_t &bitmap, emu_file &file, const char *dirname, cons { png_info png; png_error result; - + bitmap.deallocate(); /* open the file */ diff --git a/src/emu/screen.c b/src/emu/screen.c index ef2803ad8b4..f67ba97480c 100644 --- a/src/emu/screen.c +++ b/src/emu/screen.c @@ -529,7 +529,7 @@ void screen_device::realloc_screen_bitmaps() m_texture[0]->set_bitmap(&m_bitmap[0], &m_visarea, m_texture_format, palette); m_texture[1] = machine().render().texture_alloc(); m_texture[1]->set_bitmap(&m_bitmap[1], &m_visarea, m_texture_format, palette); - + // allocate generic backing bitmap m_default.allocate(curwidth, curheight, m_format); m_default.set_palette(machine().palette); diff --git a/src/emu/tilemap.c b/src/emu/tilemap.c index 52f8f47c745..aecadab3c90 100644 --- a/src/emu/tilemap.c +++ b/src/emu/tilemap.c @@ -117,10 +117,10 @@ public: INT32 dy_flipped; /* global vertical scroll offset when flipped */ /* pixel data */ - bitmap_t pixmap; /* cached pixel data */ + bitmap_t pixmap; /* cached pixel data */ /* transparency mapping */ - bitmap_t flagsmap; /* per-pixel flags */ + bitmap_t flagsmap; /* per-pixel flags */ UINT8 * tileflags; /* per-tile flags */ UINT8 * pen_to_flags; /* mapping of pens to flags */ diff --git a/src/emu/uiswlist.c b/src/emu/uiswlist.c index 011e416059e..136e142eab4 100644 --- a/src/emu/uiswlist.c +++ b/src/emu/uiswlist.c @@ -395,8 +395,8 @@ void ui_menu_software::handle() const ui_menu_event *event = process(0); if (event != NULL && event->iptkey == IPT_UI_SELECT) { - // ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_list(machine(), container, (software_list_config *)event->itemref, image))); + // ui_menu::stack_push(auto_alloc_clear(machine(), ui_menu_software_list(machine(), container, (software_list_config *)event->itemref, image))); *result = (software_list_config *)event->itemref; ui_menu::stack_pop(machine()); - } + } } diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c index de80f7c97a6..1c7e83c10ab 100644 --- a/src/emu/video/pc_vga.c +++ b/src/emu/video/pc_vga.c @@ -16,14 +16,14 @@ ega/vga 64k (early ega 16k) words of 32 bit memory - TODO: - - modernize - - convert to a device. - - fix pixel clock - - add emulated mc6845 hook-up - - fix resolution change - - fix video update. - - (and many more ...) + TODO: + - modernize + - convert to a device. + - fix pixel clock + - add emulated mc6845 hook-up + - fix resolution change + - fix video update. + - (and many more ...) ROM declarations: |
