← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/psx/dis.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/psx/dis.cpp

28

28

const char *format;

29

29

};

30

30

31

#define MASK_OP (0x3F << 26)

32

#define MASK_FUNC (0x3F)

33

#define MASK_RS (0x1F << 21)

34

#define MASK_RT (0x1F << 16)

35

#define MASK_RD (0x1F << 11)

36

#define MASK_SA (0x1F << 6)

37

38

#define MK_OP(mnemonic, format, op, func, extra_mask) { MASK_OP | (op ? 0 : MASK_FUNC) | extra_mask, (op << 26) | func, mnemonic, format }

39

40

#define MK_OP_REGIMM(mnemonic, regop) { MASK_OP | MASK_RT, (0x01 << 26) | (regop << 16), mnemonic, "s, p" }

41

42

43

#define MK_COPZ(z) { MASK_OP | (0x1 << 25), (0x1 << 25) | ((0x10 | z) << 26), "cop" #z, "F" }

44

#define MK_COP0_FUNC(mnemonic, func) { MASK_OP | (0x1 << 25) | MASK_FUNC, (0x10 << 26) | (0x1 << 25) | func, mnemonic, "" }

45

46

#define MK_COPZ_XFER(z, mnemonic, format, xf) { MASK_OP | (0x1F << 21), ((0x10 | z) << 26) | (xf << 21), mnemonic, format }

47

48

#define MK_GTE(mnemonic, format, func) { MASK_OP | (0x1 << 25) | MASK_FUNC, (0x1 << 25) | (0x12 << 26) | func, mnemonic, format }

31

#define MASK_OP (0x3FU << 26)

32

#define MASK_FUNC (0x3FU)

33

#define MASK_RS (0x1FU << 21)

34

#define MASK_RT (0x1FU << 16)

35

#define MASK_RD (0x1FU << 11)

36

#define MASK_SA (0x1FU << 6)

37

38

#define MK_OP(mnemonic, format, op, func, extra_mask) { MASK_OP | (op ? 0 : MASK_FUNC) | extra_mask, ((unsigned)op << 26) | func, mnemonic, format }

39

40

#define MK_OP_REGIMM(mnemonic, regop) { MASK_OP | MASK_RT, (0x01U << 26) | (regop << 16), mnemonic, "s, p" }

41

42

43

#define MK_COPZ(z) { MASK_OP | (0x1U << 25), (0x1U << 25) | ((0x10U | z) << 26), "cop" #z, "F" }

44

#define MK_COP0_FUNC(mnemonic, func) { MASK_OP | (0x1U << 25) | MASK_FUNC, (0x10U << 26) | (0x1U << 25) | func, mnemonic, "" }

45

46

#define MK_COPZ_XFER(z, mnemonic, format, xf) { MASK_OP | (0x1FU << 21), ((0x10U | z) << 26) | (xf << 21), mnemonic, format }

47

48

#define MK_GTE(mnemonic, format, func) { MASK_OP | (0x1U << 25) | MASK_FUNC, (0x1U << 25) | (0x12U << 26) | func, mnemonic, format }

49

49

50

50

static OpEntry ops[] =

51

51

{

Older »