~ubuntu-branches/debian/experimental/mednafen/experimental

Viewing changes to src/drivers/memdebugger.cpp

Committer: Package Import Robot
Author(s): Stephen Kitt
Date: 2012-11-19 07:00:37 UTC
mfrom: (1.2.12)
Revision ID: package-import@ubuntu.com-20121119070037-jvknrm13zvim88oc

Tags: 0.9.26-1

* New upstream WIP version.
* Change priority to "extra" to match libvorbisidec1's.
* Drop "DM-Upload-Allowed" since it is no longer appropriate.
* Refresh patches, replacing MPC_STATUS_FAIL constant from older mpcdec
versions.

files added:
src/FileStream.cpp

src/FileStream.h

src/cdrom/audioreader_opus.cpp

src/cdrom/audioreader_opus.h

src/drivers/Joystick.cpp

src/drivers/Joystick.h

src/drivers/Joystick_DOS_Standard.cpp

src/drivers/Joystick_DOS_Standard.h

src/drivers/Joystick_DX5.cpp

src/drivers/Joystick_DX5.h

src/drivers/Joystick_Linux.cpp

src/drivers/Joystick_Linux.h

src/drivers/Joystick_SDL.cpp

src/drivers/Joystick_SDL.h

src/drivers/Joystick_XInput.cpp

src/drivers/Joystick_XInput.h

src/drivers/Keyboard.h

src/hw_cpu/huc6280/dis6280.cpp

src/hw_cpu/huc6280/dis6280.h

src/psx/input/dualshock.cpp

src/psx/input/dualshock.h

src/psx/input/guncon.cpp

src/psx/input/guncon.h

src/psx/input/justifier.cpp

src/psx/input/justifier.h

src/psx/input/negcon.cpp

src/psx/input/negcon.h

files removed:
src/dis6280.cpp

src/dis6280.h

src/drivers/joystick.cpp

src/drivers/joystick.h

src/hw_cpu/.Tpo

src/psx/.Tpo

src/snes/src/obj

src/sound.h

src/sound/sound.cpp

files modified:
.pc/use-system-mpcdec.patch/configure.ac

.pc/use-system-mpcdec.patch/src/Makefile.am

.pc/use-system-mpcdec.patch/src/cdrom/audioreader.cpp

.pc/use-system-tremor.patch/configure.ac

.pc/use-system-tremor.patch/src/Makefile.am

.pc/use-system-tremor.patch/src/cdrom/audioreader.cpp

ChangeLog

Documentation/docgen.inc

Documentation/gb.html

Documentation/gba.html

Documentation/gg.html

Documentation/lynx.html

Documentation/md.html

Documentation/mednafen.html

Documentation/mednafen.php

Documentation/modules.def

Documentation/nes.html

Documentation/nes.php

Documentation/netplay.html

Documentation/ngp.html

Documentation/pce.html

Documentation/pce_fast.html

Documentation/pcfx.html

Documentation/psx.html

Documentation/settings.def

Documentation/sms.html

Documentation/snes.html

Documentation/vb.html

Documentation/wswan.html

configure

configure.ac

debian/changelog

debian/control

debian/patches/use-system-mpcdec.patch

debian/patches/use-system-tremor.patch

include/config.h.in

include/config.h.in~

src/Makefile.am

src/Makefile.in

src/MemoryStream.cpp

src/MemoryStream.h

src/Stream.cpp

src/Stream.h

src/cdplay.cpp

src/cdrom/CDAccess.cpp

src/cdrom/CDAccess.h

src/cdrom/CDAccess_Image.cpp

src/cdrom/CDAccess_Image.h

src/cdrom/audioreader.cpp

src/cdrom/audioreader.h

src/cdrom/cdromif.cpp

src/cdrom/cdromif.h

src/debug.h

src/drivers/Makefile.am

src/drivers/Makefile.in

src/drivers/cheat.cpp

src/drivers/cheat.h

src/drivers/console.cpp

src/drivers/console.h

src/drivers/debugger.cpp

src/drivers/debugger.h

src/drivers/fps.cpp

src/drivers/gfxdebugger.cpp

src/drivers/gfxdebugger.h

src/drivers/help.cpp

src/drivers/help.h

src/drivers/input-config.cpp

src/drivers/input-config.h

src/drivers/input-default-buttons.h

src/drivers/input.cpp

src/drivers/input.h

src/drivers/logdebugger.cpp

src/drivers/logdebugger.h

src/drivers/main.cpp

src/drivers/main.h

src/drivers/memdebugger.cpp

src/drivers/memdebugger.h

src/drivers/netplay.cpp

src/drivers/netplay.h

src/drivers/nnx.cpp

src/drivers/nnx.h

src/drivers/nongl.cpp

src/drivers/nongl.h

src/drivers/opengl.cpp

src/drivers/opengl.h

src/drivers/overlay.cpp

src/drivers/overlay.h

src/drivers/prompt.cpp

src/drivers/prompt.h

src/drivers/shader.cpp

src/drivers/shader.h

src/drivers/video-state.cpp

src/drivers/video.cpp

src/drivers/video.h

src/gb/gb.cpp

src/gb/memory.cpp

src/gba/GBA.cpp

src/general.cpp

src/git.h

src/hw_cpu/Makefile.am

src/hw_cpu/Makefile.in

src/hw_video/huc6270/vdc.cpp

src/lynx/cart.cpp

src/lynx/rom.cpp

src/lynx/system.cpp

src/md/cd/cd.cpp

src/md/debug.cpp

src/md/genio.cpp

src/md/system.cpp

src/mednafen-driver.h

src/mednafen.cpp

src/nes/boards/simple.cpp

src/nes/filter.cpp

src/nes/ines-correct.inc

src/nes/ines.cpp

src/nes/ines.h

src/nes/input.cpp

src/nes/input/arkanoid.cpp

src/nes/input/cursor.cpp

src/nes/input/oekakids.cpp

src/nes/input/shadow.cpp

src/nes/input/zapper.cpp

src/ngp/neopop.cpp

src/pce/debug.cpp

src/pce/huc.cpp

src/pce/input.cpp

src/pce_fast/huc.cpp

src/pce_fast/input.cpp

src/pce_fast/vdc.cpp

src/pcfx/input.cpp

src/psx/Makefile.am

src/psx/Makefile.in

src/psx/PSX-TODO

src/psx/cdc.cpp

src/psx/cdc.h

src/psx/cpu.cpp

src/psx/cpu.h

src/psx/debug.cpp

src/psx/dis.cpp

src/psx/dma.cpp

src/psx/frontio.cpp

src/psx/frontio.h

src/psx/gpu.cpp

src/psx/gpu.h

src/psx/gpu_command_table.inc

src/psx/gpu_line.inc

src/psx/gpu_polygon.inc

src/psx/input/dualanalog.cpp

src/psx/input/gamepad.cpp

src/psx/input/gamepad.h

src/psx/input/memcard.cpp

src/psx/mdec.cpp

src/psx/psx.cpp

src/psx/psx.h

src/psx/spu.cpp

src/psx/spu_fir_table.inc

src/psx/spu_reverb.inc

src/psx/timer.cpp

src/psx/timer.h

src/qtrecord.cpp

src/settings.cpp

src/settings.h

src/sexyal/drivers/dsound.cpp

src/sexyal/sexyal.cpp

src/sexyal/sexyal.h

src/sms/romdb.cpp

src/sms/system.cpp

src/snes/interface.cpp

src/snes/src/dsp/sdsp/sdsp.cpp

src/snes/src/lib/nall/static.hpp

src/snes/src/lib/nall/stdint.hpp

src/snes/src/lib/nall/varint.hpp

src/sound/Makefile.am

src/sound/Makefile.in

src/state.h

src/tests.cpp

src/types.h

src/vb/vb.cpp

src/vb/vip_draw.inc

src/video/font-data.h

src/video/surface.cpp

src/video/surface.h

src/video/text.cpp

src/wswan/main.cpp

Show diffs side-by-side

added added

removed removed

src/drivers/memdebugger.cpp

499

}

500

}

501

502

#define MK_COLOR_A(r,g,b,a) ( ((a)<<surface->format->Ashift) | ((r)<<surface->format->Rshift) | ((g) << surface->format->Gshift) | ((b) << surface->format->Bshift))

502

#define MK_COLOR_A(r,g,b,a) (pf_cache.MakeColor(r, g, b, a))

503

504

// Call this function from the main thread

505

void MemDebugger_Draw(SDL_Surface *surface, const SDL_Rect *rect, const SDL_Rect *screen_rect)

505

void MemDebugger_Draw(MDFN_Surface *surface, const MDFN_Rect *rect, const MDFN_Rect *screen_rect)

506

{

507

if(!IsActive) return;

508

509

uint32 * pixels = (uint32 *)surface->pixels;

510

uint32 pitch32 = surface->pitch >> 2;

509

const MDFN_PixelFormat pf_cache = surface->format;

510

uint32 *pixels = surface->pixels;

511

uint32 pitch32 = surface->pitchinpix;

511

512

const uint64 zemod = SizeCache[CurASpace];

512

513

514

LockGameMutex(1);

514

515

DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)ASpace->long_name, MK_COLOR_A(0x20, 0xFF, 0x20, 0xFF), 1, 1);

516

DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)ASpace->long_name, MK_COLOR_A(0x20, 0xFF, 0x20, 0xFF), 1, 1);

516

517

pixels += 10 * pitch32;

517

518

519

uint32 A;

554

555

if(Ameow == (ASpacePos[CurASpace] & ~0xF))

555

556

addr_color = MK_COLOR_A(0x80, 0xB0, 0xFF, 0xFF);

556

557

alen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)abuf, addr_color, 0, 1);

558

alen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)abuf, addr_color, 0, 1);

558

559

alen += 3;

559

560

561

for(int x = 0; x < 16; x++)

604

605

else

605

606

pix_offset += (LowNib ? 5 : 0) + x * 12;

606

607

DrawTextTrans(pixels + pix_offset, surface->pitch, rect->w, (UTF8*)"▉", MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

608

DrawTextTrans(pixels + pix_offset, surface->pitchinpix << 2, rect->w, (UTF8*)"▉", MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

608

609

}

609

610

if(InTextArea)

610

611

{

619

620

}

620

621

622

// hex display

622

DrawTextTrans(pixels + alen + x * 12, surface->pitch, rect->w, (UTF8*)quickbuf, bcolor, 0, 1);

623

DrawTextTrans(pixels + alen + x * 12, surface->pitchinpix << 2, rect->w, (UTF8*)quickbuf, bcolor, 0, 1);

623

624

625

// ASCII display

625

DrawTextTrans(pixels + alen + 16 * 12 + x * 5, surface->pitch, rect->w, (UTF8 *)ascii_str, acolor, 0, 1);

626

DrawTextTrans(pixels + alen + 16 * 12 + x * 5, surface->pitchinpix << 2, rect->w, (UTF8 *)ascii_str, acolor, 0, 1);

626

627

Ameow++;

627

628

}

628

629

pixels += 9 * pitch32;

650

651

uint32 cpplen;

651

652

uint32 cplen;

652

653

cpplen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)"Cursor position: ", MK_COLOR_A(0xa0, 0xa0, 0xFF, 0xFF), 0, 1);

654

cplen = DrawTextTrans(pixels + cpplen, surface->pitch, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

654

cpplen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)"Cursor position: ", MK_COLOR_A(0xa0, 0xa0, 0xFF, 0xFF), 0, 1);

655

cplen = DrawTextTrans(pixels + cpplen, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

655

656

if(GoGoPowerDD[CurASpace])

656

657

{

657

658

char ggddstr[32];

663

664

else

664

665

trio_snprintf(ggddstr, 32, "%08X", curpos - GoGoPowerDD[CurASpace]);

665

666

DrawTextTrans(pixels + cpplen + cplen + 8, surface->pitch, rect->w, (UTF8*)ggddstr, MK_COLOR_A(0xFF, 0x80, 0x80, 0xFF), 0, 1);

667

DrawTextTrans(pixels + cpplen + cplen + 8, surface->pitchinpix << 2, rect->w, (UTF8*)ggddstr, MK_COLOR_A(0xFF, 0x80, 0x80, 0xFF), 0, 1);

667

668

}

668

669

pixels += 5 + 10 * pitch32;

669

670

671

tmpval = zebytes[0];

671

672

trio_snprintf(cpstr, 32, "%02x(%u, %d)", tmpval, (uint8)tmpval, (int8)tmpval);

672

cpplen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)"1-byte value: ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

673

DrawTextTrans(pixels + cpplen, surface->pitch, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

673

cpplen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)"1-byte value: ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

674

DrawTextTrans(pixels + cpplen, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

674

675

676

pixels += 10 * pitch32;

676

677

681

682

uint8 waveform[wf_size];

682

683

const int32 pcm_max = (1 << ASpace->WaveBits) - 1;

683

684

DrawTextTrans(pixels - 5, surface->pitch, rect->w, (UTF8 *)"Full waveform:", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

685

DrawTextTrans(pixels - 5, surface->pitchinpix << 2, rect->w, (UTF8 *)"Full waveform:", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

685

686

pixels += 9 * pitch32;

686

MDFN_DrawRectangleFill(pixels, surface->pitch >> 2, 0, 0, MK_COLOR_A(0xA0,0xA0,0xA0,0xFF), MK_COLOR_A(0,0,0,0xFF), 2 + wf_size * 2 + 2, 2 + (pcm_max + 1) + 2);

687

MDFN_DrawRectangleFill(pixels, surface->pitchinpix, 0, 0, MK_COLOR_A(0xA0,0xA0,0xA0,0xFF), MK_COLOR_A(0,0,0,0xFF), 2 + wf_size * 2 + 2, 2 + (pcm_max + 1) + 2);

687

688

689

ASpace->GetAddressSpaceBytes(ASpace->name, 0, wf_size, waveform);

689

690

699

700

delta = current - previous;

700

701

702

for(int y = previous; y != current; y += delta / abs(delta))

702

pixels[2 + i * 2 + 0 + (2 + (pcm_max - y)) * (surface->pitch >> 2)] = MK_COLOR_A(0x00,0xA0,0x00,0xFF);

703

pixels[2 + i * 2 + 0 + (2 + (pcm_max - y)) * surface->pitchinpix] = MK_COLOR_A(0x00,0xA0,0x00,0xFF);

703

704

pixels[2 + i * 2 + 0 + (2 + (pcm_max - current)) * (surface->pitch >> 2)] = MK_COLOR_A(0x00,0xA0,0x00,0xFF);

705

pixels[2 + i * 2 + 1 + (2 + (pcm_max - current)) * (surface->pitch >> 2)] = MK_COLOR_A(0x00,0xA0,0x00,0xFF);

705

pixels[2 + i * 2 + 0 + (2 + (pcm_max - current)) * surface->pitchinpix] = MK_COLOR_A(0x00,0xA0,0x00,0xFF);

706

pixels[2 + i * 2 + 1 + (2 + (pcm_max - current)) * surface->pitchinpix] = MK_COLOR_A(0x00,0xA0,0x00,0xFF);

706

707

}

707

708

}

708

709

else

709

710

{

710

711

tmpval = zebytes[0] | (zebytes[1] << 8);

711

712

trio_snprintf(cpstr, 32, "%04x(%u, %d)", tmpval, (uint16)tmpval, (int16)tmpval);

712

cpplen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)"2-byte value(LSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

713

DrawTextTrans(pixels + cpplen, surface->pitch, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

713

cpplen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)"2-byte value(LSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

714

DrawTextTrans(pixels + cpplen, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

714

715

716

pixels += 10 * pitch32;

716

717

tmpval = zebytes[0] | (zebytes[1] << 8) | (zebytes[2] << 16) | (zebytes[3] << 24);

717

718

trio_snprintf(cpstr, 32, "%08x(%u, %d)", tmpval, (uint32)tmpval, (int32)tmpval);

718

cpplen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)"4-byte value(LSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

719

DrawTextTrans(pixels + cpplen, surface->pitch, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

719

cpplen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)"4-byte value(LSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

720

DrawTextTrans(pixels + cpplen, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

720

721

722

pixels += 10 * pitch32;

722

723

tmpval = zebytes[1] | (zebytes[0] << 8);

723

724

trio_snprintf(cpstr, 32, "%04x(%u, %d)", tmpval, (uint16)tmpval, (int16)tmpval);

724

cpplen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)"2-byte value(MSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

725

DrawTextTrans(pixels + cpplen, surface->pitch, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

725

cpplen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)"2-byte value(MSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

726

DrawTextTrans(pixels + cpplen, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

726

727

728

pixels += 10 * pitch32;

728

729

tmpval = zebytes[3] | (zebytes[2] << 8) | (zebytes[1] << 16) | (zebytes[0] << 24);

729

730

trio_snprintf(cpstr, 32, "%08x(%u, %d)", tmpval, (uint32)tmpval, (int32)tmpval);

730

cpplen = DrawTextTrans(pixels, surface->pitch, rect->w, (UTF8*)"4-byte value(MSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

731

DrawTextTrans(pixels + cpplen, surface->pitch, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

731

cpplen = DrawTextTrans(pixels, surface->pitchinpix << 2, rect->w, (UTF8*)"4-byte value(MSB): ", MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, 1);

732

DrawTextTrans(pixels + cpplen, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr , MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, 1);

732

733

734

trio_snprintf(cpstr, 32, "%s text: ", GameCode);

734

cpplen = DrawTextTrans(pixels + 10 * pitch32, surface->pitch, rect->w, (UTF8*)cpstr, MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, MDFN_FONT_5x7);

735

cpplen = DrawTextTrans(pixels + 10 * pitch32, surface->pitchinpix << 2, rect->w, (UTF8*)cpstr, MK_COLOR_A(0xA0, 0xA0, 0xFF, 0xFF), 0, MDFN_FONT_5x7);

735

736

737

{

737

738

char rawbuf[64];

749

750

iconv(ict_to_utf8, (ICONV_CONST char **)&inbuf, &ibl, &outbuf, &obl);

750

751

textbuf[obl_start - obl] = 0;

751

752

DrawTextTrans(pixels + 8 * pitch32 + cpplen, surface->pitch, rect->w - cpplen - 13, (UTF8*)textbuf, MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, MDFN_FONT_9x18_18x18);

753

DrawTextTrans(pixels + 8 * pitch32 + cpplen, surface->pitchinpix << 2, rect->w - cpplen - 13, (UTF8*)textbuf, MK_COLOR_A(0xFF, 0xFF, 0xFF, 0xFF), 0, MDFN_FONT_9x18_18x18);

753

754

}

754

755

756

}

774

775

}

775

776

else

776

777

{

777

DrawTextTrans((uint32*)surface->pixels + (rect->h - 7) * pitch32, surface->pitch, rect->w, (UTF8*)error_string, MK_COLOR_A(0xFF, 0x00, 0x00, 0xFF), 1, 1);

778

DrawTextTrans((uint32*)surface->pixels + (rect->h - 7) * pitch32, surface->pitchinpix << 2, rect->w, (UTF8*)error_string, MK_COLOR_A(0xFF, 0x00, 0x00, 0xFF), 1, 1);

778

779

}

779

780

}

780

781

}

Older »