comex
4cf8697957
Merge pull request #1480 from RachelBryk/warn
...
Fix some warnings.
2014-11-03 00:36:40 -05:00
Lioncash
7c698b0ece
Merge pull request #1478 from magcius/memmap-cleanup
...
MemArena: Fix a memory leak caused by pointer confusion
2014-11-02 23:30:38 -05:00
Jasper St. Pierre
f660789254
MemArena: Merge the initialization code with the size calculation code
...
To make mistakes like in the previous commit less prevalent in the future.
2014-11-02 19:59:14 -08:00
Rachel Bryk
114b0f5d94
Fix some warnings.
2014-11-02 22:39:20 -05:00
Jasper St. Pierre
5e5ed07b41
MemArena: Fix the calculation of position in SHM
...
The code to calculate the offsets into the SHM file wasn't properly
respecting the skip flags, causing it to calculate offsets beyond
the end of the SHM file.
2014-11-02 19:25:42 -08:00
Jasper St. Pierre
64540bc60d
MemArena: Fix a memory leak caused by pointer confusion
...
This code was ported from out_ptr, which was a double-pointer, and
wanted to double-check that the proper arena was actually allocated.
When I ported it to store the pointer directly in the view regardless
of whether out_ptr was non-NULL, I got confused here and instead
caused the code to only free the arena if the first byte was non-zero.
2014-11-02 19:25:42 -08:00
Ryan Houdek
204598a082
Merge pull request #1350 from FioraAeterna/integeropts
...
Various smallish JIT optimizations
2014-11-02 20:13:20 -06:00
skidau
347e8e8157
Merge pull request #1380 from RachelBryk/ext-tas-input
...
Add nunchuck support to tas input.
2014-11-03 12:57:27 +11:00
Rachel Bryk
2eac08aa30
Add nunchuk support to tas input.
2014-11-02 20:52:13 -05:00
Lioncash
a41397d5d7
Merge pull request #1475 from lioncash/bind
...
TASInputDlg: Use Bind over Connect for event handling
2014-11-02 20:38:15 -05:00
comex
08b61fdd9c
Merge pull request #1465 from degasus/master
...
VideoCommon: Remove GetPointer in fifo code
2014-11-02 19:58:45 -05:00
Lioncash
3042fdbc5a
Merge pull request #1425 from magcius/memmap-cleanup
...
Memmap: Cleanup code
2014-11-02 19:57:43 -05:00
Jasper St. Pierre
1e93b0db19
MemArena: Rename GrabLowMemSpace to GrabSHMSegment
...
This code originally tried to map the "low space" for the Gamecube's
memory layout, but since has expanded to mapping all of the easily
mappable memory on the system. Change the name to "GrabSHMSegment" to
indicate that we're looking for a shared memory segment we can map into
our process space.
2014-11-02 16:51:27 -08:00
Jasper St. Pierre
079b881d20
MemArena: Clean up the code that does the mirroring
2014-11-02 16:51:26 -08:00
Jasper St. Pierre
6813473367
MemArena: Remove the low mappings for our pointers
...
These are effectively unused, since the memmap already maps them in one
place. For 32-bit, they might have some slight advantage, but we already
special-case the regular "high-mem" pointer for 32-bit, so just use the
one we already have...
2014-11-02 16:50:36 -08:00
Jasper St. Pierre
8858dc7764
Memmap: Remove vestigals of the memory-mapped EFB
...
It hasn't been memory-mapped for a long time.
2014-11-02 16:34:17 -08:00
Jasper St. Pierre
dd0aadac97
MemoryWindow: Use p_pFakeVMEM, not the virtual mirror
...
They point to the same contents, so there's no reason to use the
mirror. This lets us make all the mirrors static.
2014-11-02 16:34:17 -08:00
Jasper St. Pierre
4a59750b30
MemArena: Bail on Arch64 if the out_ptr allocation fails
2014-11-02 16:34:17 -08:00
Jasper St. Pierre
5a2340fead
Memmap: Make the constants aligned to 8 nibble characters
...
Otherwise, the constants can be a bit confusing to read.
2014-11-02 16:34:17 -08:00
Jasper St. Pierre
6317721c95
MemmapFunctions: Remove unused effective_address argument
2014-11-02 16:34:17 -08:00
Jasper St. Pierre
48aff73b6a
MemArena: Remove duplicated code
...
I can't find any obvious difference between these two paths.
2014-11-02 16:34:17 -08:00
Jasper St. Pierre
81939e808f
Memmap: Clean up indentation and whitespace a bit
2014-11-02 16:34:17 -08:00
comex
890b788633
Merge pull request #1467 from waddlesplash/dolphin-qt
...
DolphinQt: Games now boot!
2014-11-02 18:08:55 -05:00
Lioncash
444e4fe3cf
TASInputDlg: Use Bind over Connect for event handling
2014-11-02 14:16:07 -05:00
Augustin Cavalier
3d63d22e53
DolphinQt: adapt so that it can boot games.
2014-11-02 13:53:48 -05:00
Ryan Houdek
1c41acaddd
Merge pull request #1264 from Stevoisiak/GCM-to-ISO
...
Gcm to iso
2014-11-02 11:29:41 -06:00
Ryan Houdek
b8cba759f4
Merge pull request #1398 from Stevoisiak/setDefaultISOFiletypes
...
ConfigMain: Added missing filetypes to default ISO options
2014-11-02 11:24:43 -06:00
Stevoisiak
d937c072a5
Updated android GCM references to ISO
2014-11-02 12:22:36 -05:00
Augustin Cavalier
29593d403b
Move GLInterface to the OGL VideoBackend's directory.
2014-11-02 12:16:33 -05:00
Ryan Houdek
66f0ac2417
Merge pull request #1401 from Stevoisiak/updateResolutionTooltip
...
VideoConfigDiag: Updated video resolution description
2014-11-02 11:13:29 -06:00
Ryan Houdek
6e43562496
Merge pull request #1468 from Tilka/cleanup
...
Small cleanup
2014-11-02 11:02:35 -06:00
Ryan Houdek
2c602137b1
Merge pull request #1472 from lioncash/i18n
...
DolphinWX: Make the TAS dialog window titles translatable.
2014-11-02 09:58:10 -06:00
Ryan Houdek
13d58b3f16
Merge pull request #1460 from phire/moreGetPointer
...
Remove GetPointers in VideoSoftware.
2014-11-02 09:57:16 -06:00
Ryan Houdek
cd64253cb4
Merge pull request #1459 from Buddybenj/nunchuk
...
Nunchuck -> Nunchuk Fixes
2014-11-02 09:44:43 -06:00
Ryan Houdek
2b69d76e88
Merge pull request #1448 from skidau/mmio-read32
...
Fixed the endianess of the 32bit MMIO reads.
2014-11-02 09:36:43 -06:00
Ryan Houdek
0d70880d89
Merge pull request #1466 from Sonicadvance1/ARMv7-and-optimization
...
Optimizes ARMv7 andi{s,}_rc implementations.
2014-11-02 09:33:37 -06:00
Ryan Houdek
824bad458c
Merge pull request #1454 from lioncash/interp
...
Interpreter: Remove a redundant macro
2014-11-02 09:33:19 -06:00
Ryan Houdek
409b240c2e
Merge pull request #1469 from Tilka/nogui_abort
...
Reorder MainNoGUI shutdown
2014-11-02 09:31:51 -06:00
Ryan Houdek
83fcf710e8
Merge pull request #1462 from FioraAeterna/fixmftb
...
JIT: more mftb fixes
2014-11-02 09:31:25 -06:00
Lioncash
3d83433e90
DolphinWX: Make the TAS dialog window titles translatable.
2014-11-02 02:11:40 -05:00
Lioncash
9daaf94f3c
Merge pull request #1470 from lioncash/ui
...
CheatSearchTab: Use a more specific event type for ApplyFocus
2014-11-02 01:12:21 -04:00
Lioncash
ca2391dd1e
CheatSearchTab: Use a more specific event type for ApplyFocus
2014-11-02 00:30:02 -04:00
Tillmann Karras
ff41dd479b
Fix warnings about non-static variables
2014-11-02 04:51:44 +01:00
skidau
59c673aec6
Merge pull request #1161 from rohit-n/ogl-vector
...
OGL: Use unique_ptr instead of pointer when taking screenshot.
2014-11-02 14:19:00 +11:00
skidau
b241b6eadd
Merge pull request #1452 from lioncash/morestatic
...
GCPadEmu/WiimoteEmu: Make some arrays static
2014-11-02 14:15:13 +11:00
comex
5d18c66c99
Merge pull request #1464 from phire/usb_keyboard
...
Remove GetPointer from Wii USB Keyboard.
2014-11-01 22:35:37 -04:00
Tillmann Karras
a248db0b65
Reorder MainNoGUI shutdown
...
Before this change I always got this when closing dolphin-emu-nogui:
X Error of failed request: BadWindow (invalid Window parameter)
Major opcode of failed request: 10 (X_UnmapWindow)
Resource id in failed request: 0x3400003
Serial number of failed request: 215
Current serial number in output stream: 219
terminate called without an active exception
Aborted
2014-11-02 03:31:47 +01:00
Lioncash
b6b7b823c3
Merge pull request #1455 from lioncash/dammit-wxwidgeeeeeets
...
VideoCommon{Backends}: Remove unnecessary wxWidgets references.
2014-11-01 22:29:18 -04:00
Tillmann Karras
f4fed0dea0
JitAsm: remove unused code pointers
2014-11-02 02:00:47 +01:00
Tillmann Karras
033f2a7e93
x64ABI: get rid of some duplicate code
2014-11-02 02:00:47 +01:00