d6b042f9fe
Merge branch 'master' of https://github.com/PCSX2/pcsx2
2014-07-16 12:32:51 +02:00
735e441afc
Merge pull request #132 from Dokman/patch-1
...
Deleting avg thing of the full installer
2014-07-16 12:32:12 +02:00
48d00e817f
Merge pull request #145 from Sonicadvance1/zzogl-pointer-cast
...
Fix a pointer cast on x86_64 in zzogl.
2014-07-16 10:53:54 +01:00
ce4dc4ae21
Allow hotplugging XInput devices in LilyPad
2014-07-16 11:18:20 +02:00
0c1087a2e5
Remove HashTools::IHashable/CommonComparisonClass
...
These are no longer used.
2014-07-15 22:08:11 -05:00
abd605a066
Remove HashTools::HashSet.
...
This is no longer used.
2014-07-15 22:07:03 -05:00
5bd06d3a02
Remove HashTools::HashMap/SpecializedHashMap
...
These are no longer used. Wipe them out.
2014-07-15 22:05:36 -05:00
391cf379ae
Remove usages of HashTools::Dictionary/HashMap
...
Replace these usages with unordered_map since they are just as quick
2014-07-15 22:02:14 -05:00
264cce2003
Also remove UnicodeDictionary.
...
This class isn't used anywhere and we should promote usage of std::unordered_map instead of this class
2014-07-15 21:01:30 -05:00
79dd0958d0
Remove the pxDictionary class since it is no longer needed.
...
This was only used by the game database, which has now been changed to an unordered_map
2014-07-15 20:58:25 -05:00
2c6188b73f
Switch the GameDatabase from using a pxDictionary to a std::unordered_map.
...
Both implementations are about the same, which is hard to measure since we are limited in speed due to the hashing function.
Both implementations averaged ~220ms to load the full game database on my workstation.
2014-07-15 20:55:52 -05:00
33adabb035
Fix some _M_AMD64 checks in GSdx.
...
In the future these will be _M_X86_64, but for now this won't be the case.
2014-07-15 18:21:03 -05:00
616500b8f3
Disabled preferred stack boundary on x86_64in GSdx.
2014-07-15 18:18:59 -05:00
2f98f5a6d6
Fix a pointer cast on x86_64 in zzogl.
2014-07-15 18:16:14 -05:00
2a6656050c
Fix the BitScanForward implementations for x86_64.
2014-07-15 18:13:32 -05:00
80b22ca2be
Merge pull request #140 from Kingcom/Debugger
...
Various debugger fixes and enhancements
2014-07-15 23:59:07 +01:00
53159a81cf
-Add lq/sq preview
...
-fix potential memory access exceptions
-prevent the disassembly from changing positions when a breakpoint is toggled
-only use the status bar text from the current cpu
2014-07-16 00:51:53 +02:00
6f0f7ce948
Merge pull request #110 from Sonicadvance1/hashmap_64bit
...
Support 64bit address hashing in the CommonHashClass.
2014-07-15 23:15:03 +01:00
c21dd828d5
Merge pull request #137 from Sonicadvance1/vtlb-64bit
...
Fix vtlb compiling for x86_64.
2014-07-15 23:13:08 +01:00
97bed8e710
Fix vtlb compiling for x86_64.
...
This has no functional change on x86_32, it's mostly just changing a few pointer to u32 conversions to uptr and sptr.
I can not yet confirm if this runs on x86_64, but compiling is enough of an issue currently.
2014-07-15 16:42:59 -05:00
aaf70d652b
Merge pull request #138 from Sonicadvance1/yuv2rgb-64bit
...
Let non-x86_32 use the reference yuv2rgb conversion function.
2014-07-15 22:34:38 +01:00
54c21b30c9
cdvdGigaherz: Fix the seek function in FileStream.
...
Prior to this, it would have ignored any kind of reference position.
2014-07-15 17:28:13 -04:00
91f23938b5
Merge pull request #136 from Sonicadvance1/gui-pointers
...
Fix two conversions of pointers to integer in the GUI.
2014-07-15 22:20:37 +01:00
0af0db6593
Fix two conversions of pointers to integer in the GUI.
...
Use uptr instead of 32bit integers fixes the issue of compiling.
2014-07-15 16:18:24 -05:00
7a1ebd22ed
Merge pull request #135 from Sonicadvance1/jmp_emitter
...
Change the x86emitter jmp emitter from using s32 to sptr.
2014-07-15 22:16:04 +01:00
c2e96a081f
cdvdGigaherz: Use booleans instead of ints to represent conditionals in CDVD.cpp
2014-07-15 17:06:49 -04:00
1d56035a56
Merge pull request #134 from Sonicadvance1/NOT32-declaration
...
Fix NOT32M function declaration.
2014-07-15 22:06:48 +01:00
0e68a9e0fc
Merge pull request #133 from Sonicadvance1/microvu_ptr
...
Fix microVU converting pointers to u32.
2014-07-15 22:02:19 +01:00
a143a8b1f6
Let non-x86_32 use the reference yuv2rgb conversion function.
...
The yuv2rgb_sse2 implementation is x86_32 only, so x86_64 can't take advantage of this optimized code path.
This requires the architecture defines to be working fully, so this can't be merged until it is fixed on the Windows side of things.
2014-07-15 15:31:07 -05:00
5114b37bfa
Change the x86emitter jmp emitter from using s32 to sptr.
...
This doesn't change anything on x86_32, but it is required on x86_64 so we don't lose precision.
Also adds an assert to see if the distance is greater than the maximum 32bit jump, which can't be hit on x86_32, but can be on x86_64.
2014-07-15 15:16:30 -05:00
8c746302a2
Fix NOT32M function declaration.
...
Use uptr as the argument since it is either u32 or u64 depending on architecture.
2014-07-15 15:05:46 -05:00
a1d6ca2298
Fix microVU converting pointers to u32.
...
Convert them to uptr instead to make it architecture independent.
2014-07-15 15:04:08 -05:00
d6a617c225
Deleting avg thing of the full installer
...
If now you have drop the avg toolbar it does nothing here i think
2014-07-15 18:30:49 +02:00
69f57351b2
Merge pull request #109 from Sonicadvance1/windows_arch_defines
...
Support _ARCH_32/64 defines on Windows
2014-07-15 17:04:21 +02:00
c4d5267107
Merge pull request #128 from Sonicadvance1/linux_arch_defines
...
Support _M_X86[_32/_64] on Linux.
2014-07-15 17:04:20 +02:00
6b1ee680a2
Support _ARCH_32/64 _M_X86[_32/_64] defines on Windows
...
This defines the correct define depending on architecture build target.
Currently Windows doesn't support a x86_64 build target, but once it does the define will be in place.
2014-07-15 09:16:37 -05:00
d3ebdae159
Merge pull request #131 from lioncash/gsdx-wat
...
GSDX: Replace an FLT_MAX with the appropriate ULONG_MAX
2014-07-15 12:04:14 +01:00
86a0d3faff
Merge pull request #124 from lioncash/array-bounds
...
sVU_zerorec.cpp: Correctly guard against invalid indexes in SuperVUDestroy
2014-07-15 11:27:53 +01:00
3f62ad08e1
Merge pull request #122 from lioncash/indents
...
COP0: Fix indentation for function TLBR
2014-07-15 11:26:13 +01:00
1a483a7d88
Merge pull request #121 from lioncash/zzogl-fix
...
ZZOGL: Fix an incorrect formatting argument in the Win32 config.
2014-07-15 11:22:45 +01:00
3daff15f34
Merge branch 'master' of https://github.com/PCSX2/pcsx2
2014-07-15 11:56:55 +02:00
1736c1e32e
Merge pull request #125 from lioncash/cdghz
...
cdvdGigaherz: Simplify the loops within readLine and readLineW
2014-07-15 11:53:36 +02:00
764ca25f8d
Merge pull request #120 from lioncash/dev9ghzdrk
...
DEV9ghzdrk: Clarify precedence for a bitwise AND in smap.
2014-07-15 11:53:27 +02:00
79ee48d91b
Merge pull request #129 from lioncash/spu2x-warnings
...
SPU2-X: Fix some signed/unsigned mismatch warnings.
2014-07-15 11:52:02 +02:00
e2f4fc245a
Merge pull request #127 from lioncash/dev9-warnings
...
dev9ghzdrk: Fix a few warnings.
2014-07-15 11:49:37 +02:00
f26319a2b0
Merge pull request #126 from lioncash/dev9-unused
...
dev9ghzdrk: Remove unreachable code.
2014-07-15 11:49:12 +02:00
637c99a362
GSDX: Replace an FLT_MAX with the appropriate ULONG_MAX
2014-07-15 01:47:26 -04:00
a1a0ed0563
Support _M_X86[_32/_64] on Linux.
...
These go hand in hand with PR #109 but for Linux as well.
These are much more useful defines than what other compilers give us.
2014-07-14 23:58:02 -05:00
0a825a1aa4
SPU2-X: Fix some signed/unsigned mismatch warnings.
2014-07-15 00:09:48 -04:00
b5f805fc6c
dev9ghzdrk: Fix a few warnings.
...
Mostly unsigned mismatches.
2014-07-14 23:41:51 -04:00
ramapcsx2