100 Commits
Author SHA1 Message Date
Peter Tissen 4624377942 use official wxWidgets repo 2015-07-23 12:17:58 +02:00
Peter Tissen ecf78dbafe add various temporary VS2015 changes (some to fixup temporary bugs, don't merge) 2015-07-22 01:32:21 +03:00
Peter Tissen 0b0c8723eb Change GetDeviceLocal device selection
For `GetDeviceLocal` only consider a device if the full path to the device
matches the first part of the path to match.

The issue was that putting in a file that was not in a sub-path of an existing
mounted device failed. So if the rpcs3 devices are in
D:\DEV\rpcs3\bin and you open D:\DEV\ps3autotests\tests\rsx\primitives\primitives.ppu.elf
it would return
/dev_usb000/ps3autotests\tests\rsx\primitives\primitives.ppu.elf
which resolves to
D:/DEV/rpcs3/bin/dev_usb000/ps3autotests/tests/rsx/primitives/primitives.ppu.elf
and is wrong.

Correct are either /dev_usb000/../../../ps3autotests\tests\rsx\primitives\primitives.ppu.elf
or /hostfs/D:\DEV\ps3autotests\tests\rsx\primitives\primitives.ppu.elf

I chose to resolve without the ".." beyond root, since that just seems wrong
(so it will now return the hostfs version).

Fixes #1090
2015-05-21 10:45:40 +02:00
Peter Tissen fe1b0e70b9 Update WxWidgets repository
This is in preparation to make it easy to compile with VS2015.

Also there's notables changes in wxWidgets that we might find very useful,
such as being able to create OpenGL debug contexts.

The change in .gitmodules might make it necessary for people to run
"git submodule sync" after pulling these changes
2015-05-08 21:25:17 +02:00
Peter Tissen fd34d11eec Merge branch 'p4-Bundle' 2015-04-18 20:28:30 +02:00
Peter Tissen 92acfcf454 seperate repo adds into seperate commands, for consistency 2015-04-14 00:20:13 +02:00
Peter Tissen d140cffc08 remove the publicly accessible version of the template parameter in lwmutex::const_be_u32_t because it's never used and causes linker errors in clang 3.4 (and allegedly gcc 4.8.4) 2015-04-08 22:43:29 +02:00
Peter Tissen a404f2e6fa Add iconv to linked libs on non-linux UNIX
of course the correct solution would be to actually search for the symbols
but that seems like a lot of efford just for the sake of doing it right.
This should probably suffice for all relevant platforms for now.
2015-02-18 19:30:04 +01:00
Peter Tissen 518c028a3d Only link to librt on Linux
The library is not needed on OSX and does not seem to exists there
2015-02-18 15:59:26 +01:00
Peter Tissen 068883a441 Add librt to the list of linked libraries
This is needed by `shm_unlink` and similar functions. Fixes #997
2015-02-11 00:44:22 +01:00
Peter Tissen 8ce1de036a fix #elif with no condition 2015-02-02 22:38:47 +01:00
Peter Tissen 13d2f8fa59 re-enable threadlist in GUI
This used to crash so it was removed. However I think this is a cruicial feature.
This is the only way to observe the stack-frames, registers and disasm around the PC
in a user friendly way.

The reason this caused crashes was that we got a reference to a std::vector and iterated
over it in one thread while another thread could modify it (and thereby invalidating the
iterators). The way I "fixed" it is to just copy the `std::vector<std::shared_ptr<...>>`
and iterate over the copy. This obviously has some overhead (locking the shared_ptr
counters and incrementing them). It also allows entities other than the Thread manager
to keep the Thread objects frome being deleted but that should not be a problem.
2015-02-02 11:33:49 +01:00
Peter Tissen bd65f81074 Fix some small mistakes
* replace_first and replace_all were in the wrong namespace, so they could not be linked
* replace_all did not work correctly (would loop indefinately)
* cellGcmUnmapIoAddress did not shif the size, so it would run past the end of the mmap array
* fsstat did use a 32-bit size on Windows, so files >4 gigs would return "stat failed"
2015-02-02 11:27:18 +01:00
Peter Tissen 57361e2943 forgot to remove somicolon 2015-01-15 04:00:43 +01:00
Peter Tissen 71225da135 don't distinguish between windows and unix for no reason 2015-01-15 03:34:03 +01:00
Peter Tissen 1af2f5b214 remove dependency on CMake and python 2014-10-26 17:59:08 +01:00
Peter Tissen f11c6c3cf4 change initial value of sys_lwmutex_t::waiter 2014-10-02 15:13:44 +02:00
Bigpet 96c86580f0 define templates outside of block scope 2014-09-16 15:03:57 +02:00
Peter Tissen 383f6aff2b unix preprocessor define typo fixed 2014-09-03 12:12:50 +02:00
Peter Tissen afe493f187 use a include directory relatie to the lists file 2014-07-23 19:51:41 +02:00
Peter Tissen 0fe32fa0d3 fix a typo in the packaging batch file
the soft_oal.dll was written with a dash which is clearly wrong
2014-07-19 15:09:39 +02:00
Peter Tissen 38333f01e3 Merge remote-tracking branch 'origin/pr/571' 2014-07-14 22:02:26 +02:00
Peter Tissen f75a3c8f60 unload modules upon stopping I guess we won't find out what's wrong if we don't let it fail 2014-07-12 13:52:37 +02:00
Peter Tissen 10d9c3e412 add back /Y flag on xcopy
to make sure no stdin input is requuired
2014-07-09 17:27:20 +02:00
Peter Tissen dd382b2afc add files to allow for packaging on teamcity
add initial appveyor script

add submodule update before build

add msbuild cmd

remove msbuild cmd

make script runnable locally

add solution without wxwdigets

add initial appveyor script

add submodule update before build

add msbuild cmd

remove msbuild cmd

add packaging step to appveyor

add ftp upload test

use msbuild explicitly

doesn't seem to work otherwise

temporarily remove deploy script

temporarily remove build script

remove non-essential stuff

add back some stuff

set artifact path

update artifact stuff

try to add back deploy

add build step again, *sigh*

add some more build settings

add build sript style build again

download wxwidgets instead of building

remove quite flag for debugging

add cert igonre to download

dont redundantly add folder

use a seperate solution without wxwidgets dependencies

only use the rpcs3 7z as artifact

to avoid re-packaging wxwidgets, also comment out deployment, since I don't have acccess to the main account to add secure strings

Conflicts:
	package.bat
2014-07-09 17:18:23 +02:00
Peter Tissen ad83fb325c fix compile error on the Debug - Memleak config 2014-07-06 19:40:51 +02:00
Peter Tissen 061fe50835 don't prompt for xcopy
don't ask whether to override files when copying them for packaging
2014-07-04 13:13:47 +02:00
Peter Tissen c5e780ffb2 Merge pull request #392 from Bigpet/master
make package script runnable locally
2014-07-04 12:19:01 +02:00
Peter Tissen ba29a19e82 make script runnable locally 2014-07-04 12:15:43 +02:00
Peter Tissen d84c619882 Merge pull request #391 from Bigpet/master
add files to allow for packaging  on teamcity
2014-07-04 10:32:02 +02:00
Peter Tissen 69c9d95f10 add files to allow for packaging on teamcity 2014-07-04 10:29:31 +02:00
Peter Tissen 95f1a0e645 use only one set of logging macros instead of two and don't use free() as a function name 2014-06-27 15:28:17 +02:00
Peter Tissen ae472e9e67 use a more compact method to add and remove listeners t o all channels 2014-06-27 09:22:00 +02:00
Peter Tissen 1ad4380fab rename conlog gui file and set the logbuffer-consumed flag sooner 2014-06-27 06:01:40 +02:00
Peter Tissen 21da317453 Logging system rework
* use one central unified log with channels/priorities ad-hoc listener registration and de-registration
* disable buffering by default
* add multi-threaded ringbuffer implementation
* use buffered listener for the gui (using the ringbuffer)
2014-06-26 17:34:28 +02:00
Bigpet 0d42fcf536 Merge pull request #325 from Bigpet/master
add dependency on asmjit to rpcs3 project
2014-06-09 05:39:12 +02:00
Peter Tissen 779117d129 fix machine specific path, sorry about that one 2014-06-09 05:37:12 +02:00
Peter Tissen 2382f3b69e add dependency on asmjit to rpcs3 project, might fix the buildbot 2014-06-09 03:36:26 +02:00
Peter Tissen e85abdeb2c remove unexplained commented out code that I added myself with the last PR
* remove unexplained commented out code that I added myself
* revert asmjit settings change that was meant to only be local for me
2014-06-09 02:55:16 +02:00
Peter Tissen 33d82e0d6e reset debug output directory 2014-06-08 23:23:36 +02:00
Peter Tissen ed10ea7544 add back fused gui log classes, this needs to be redone another way
also, add back wx requirement for strfmt
2014-06-08 23:16:08 +02:00
Peter Tissen 10e10de98d add xinput pad handler to the windows emucore 2014-06-08 23:16:07 +02:00
Peter Tissen 314307b840 Fix building with precompiled headers
add the unimplemented modules to the emucore project

fix a bug in the rXml wrapper that didn't consider the possiblity of functions returning null pointers
2014-06-08 23:16:06 +02:00
Peter Tissen c37905e465 initial start to eliminate static func init, not compilable atm
move module initialization into a module manager, still has some issues like stopping not working and debug crashing

add #idef 0 to modules that aren't in the windows project

don't double initialize and don't de-initialize for now, since many modules don't expect it and it leads to many errors

remove duplicate module lists for empty modules and implemented ones, make Module non-copyable but movable

add secondary project, no real use for it now

add some memleak config to the emucore and add asmjit path to rpcs3

small rebase error fixed to get it to compile again

add filters for emucore

re-add the module manager and static file

WIP commit, linker errors abound

some more abstraction layer stuff

fix the remaining linker errors, re-enable platform specific mouse, pad and keyboard handlers

rebasing

fix memset undefined and re() usage of se_t before declaration

Add wxGUI define by default for cmake builds

fix copy constructors of Datetime header

fix copy constructors of other wx interface classes

remove static declarations of global variables

make wxGLCanvas constructor non-ambiguous even with wx2.8. compat mode, fix wrong std::exception constructor calls

remove duplicate definition for FromUTF8 and ToUTF8

temp changes
2014-06-08 23:16:06 +02:00
Peter Tissen 4d84507c96 try include guards to circumvent a weird error with gcc and unity builds 2014-06-08 16:58:40 +02:00
Peter Tissen 982ea35d44 enable full precompiled headers for non-Windows Platforms for now to make people not guess all the time what to include 2014-06-08 16:43:53 +02:00
Peter Tissen 8da681eab2 enable cotire for better build-times 2014-06-06 03:33:24 +02:00
Peter Tissen 40add8f9a2 Seperate ConLog.h and ConLogFrame.h (for now only seperate headers)
make precompiled header slimmer under Linux to increase CI and dev-machine build-times

make sure unused modules don't compile
add unused modules to the VS project to easier keep track of them
2014-06-06 02:50:22 +02:00
Peter Tissen e8efb8f9fb move inline definitions in header, wtf am I doing, Travis pls. 2014-06-02 22:00:05 +02:00
Peter Tissen 1bb140780b include cstdint type
add mulh like function for gcc

avoid multiple definitions of msvc intrinsic replacements
2014-06-02 21:12:35 +02:00
Peter Tissen 96e229abfa add primitive InterlockedOr64 implementation
use non msvc specific type for int64_t

add umul for gcc
2014-06-02 19:29:22 +02:00
Peter Tissen c216c0f2e8 revert argument order again, doesn't really need to be reversed, will just cause confusion 2014-06-01 23:07:35 +02:00
Peter Tissen 2d77415cc3 use non-wx header only Ini library in preparation of the core/gui devide 2014-06-01 22:57:50 +02:00
Bigpet 924f117ba0 help out compilers that use two phase lookup as dictated by the standard 2014-06-01 21:28:29 +02:00
Peter Tissen ca64054505 some light formatting and hotkeys for main frame restored 2014-05-10 16:00:34 +02:00
Peter Tissen 4c5b5f709f match project dependencies for wxStuff from their *.sln 2014-05-09 11:16:31 +02:00
Peter Tissen 4de24cb436 more compact precompiler checking 2014-05-01 19:32:16 +02:00
Peter Tissen 0aa8a9f372 fix OpenGL includes for Win32 2014-05-01 19:29:28 +02:00
Peter Tissen 3220e9bbc4 format warning disable for clang, typo correction 2014-04-28 21:50:07 +02:00
Peter Tissen baaa2ae45a format warning disable for clang, it clutters up the build messages too much 2014-04-28 21:36:31 +02:00
Peter Tissen 92d556524b well let's hope Clang doesn't mind implicit unsigned int to u64 2014-04-28 21:18:11 +02:00
Peter Tissen fad6c7cecb add asmjit path hack, we'll get rid of it sooner or later 2014-04-27 21:32:12 +02:00
Peter Tissen 870fa5a153 explicit cast from void(*)() to void * 2014-04-27 20:23:32 +02:00
Peter Tissen 0bcadaf155 explicitER casting, why you heff to be mad Clang 2014-04-27 20:13:47 +02:00
Peter Tissen 95ca5315e7 fix path to the asmjit lib 2014-04-27 19:59:12 +02:00
Peter Tissen 9d3d7b09b3 explicit casting 2014-04-27 19:55:31 +02:00
Peter Tissen 7169972434 disable cotire for now 2014-04-27 19:34:09 +02:00
Peter Tissen 4981c576d2 rename all the non-standard include file extensions to *.h 2014-04-27 19:28:03 +02:00
Peter Tissen 6a24d2bbac fix typo in cmakelists.txt, again 2014-04-27 19:23:11 +02:00
Peter Tissen 07841fc9e3 fix typo in cmakelists.txt 2014-04-27 19:17:41 +02:00
Peter Tissen 85be97e6a2 add explicit casts for the ptrdiffs 2014-04-27 19:15:35 +02:00
Peter Tissen a766f5951d add precompiled header build to cmake to speed up building 2014-04-27 19:07:20 +02:00
Peter Tissen 60a7fe17b5 remove .m128i_uxx subscripts because they're non standard 2014-04-27 18:51:24 +02:00
Peter Tissen f906d031fa remove more offsetof calls on linux and add asmjit linkage 2014-04-27 18:37:21 +02:00
Peter Tissen 1ba5cafc5f enable SPU recompiler on linux 2014-04-27 18:18:04 +02:00
Bigpet eea3aa9729 This is squashed commit from the follwing commits:
* various changes to make it compile with clang

* don't compile recompiler on linux yet but make the CMake build include asmjit already

* add experimental travis bot

* modify yml to match

* try to build and install wxWidgets, since it's not in the travis repo

* use newer cmake version for travis

* add keys with sudo

* use sudo for all apt- commands

* Add additional dependencies

* use version approriate gcc flags for c++11

* try clang, gcc too old

* set c++0x flag for clang

* use gcc 4.8

* use gcc 4.8 and add the repo for it

* use gcc 4.8 even for clang to get newer headers

* fix ambiguous conversions

* add lz from hykem and more explicit conversions from be for x86

* more switch disambiguation

* more switch disambiguation

* add additional unigned int casts to deal with be_t conversion ambiguity

* remove unnecessary clang flag

* add lz.cpp to vcxproj and cast to u32 instead of unsigned int

* correct temporaray #ifdefs
2014-04-27 00:41:46 +02:00
Peter Tissen ee9d25c675 forgot the right check 2014-04-18 13:31:37 +02:00
Peter Tissen 79eaffaaa7 copying class with pointers as member when deleting them in the desctructor is danger zone. 2014-04-18 13:28:27 +02:00
Peter Tissen f073f1ca4b yeah, that happened 2014-04-15 14:48:21 +02:00
Peter Tissen 8ef9414406 try to reign in the vector<ptr> madness 2014-04-14 10:55:43 +02:00
Peter Tissen 552b71a378 fix not range-checked vector access 2014-04-14 09:01:31 +02:00
Bigpet a14c61802e quote guard CMake variables 2014-04-12 21:36:34 +02:00
Peter Tissen cdaca2d308 fix accidental wxWidgets version change 2014-04-12 12:09:48 +02:00
Bigpet 25c3aa8e19 fixes to get llvm to compile (excepti for utils.cpp, that'll get fixed
later)

Eradicate the Array almost everywhere, some usages like Stack still
remains
2014-04-12 12:06:52 +02:00
Peter Tissen d65968b41d unify line endings to shut up VS 2014-04-12 11:42:20 +02:00
Peter Tissen 10ca726752 Remove GCC specific variadic macro syntax 2014-04-08 21:47:02 +02:00
Peter Tissen 4066950975 Various warning fixes and devirtualization
* Remove ArrayString
* devirtualize GetCount and SetCount, they're no longer needed
* set storage duration of fmt::placeholder to extern to be consistent
* make length unsigned and the return value of sprintf signed
* remove dead code "s.Close()" is never reached
* devirtualize WrteToLog()
* devirtualize Ini functions
2014-04-08 19:41:47 +02:00
Peter Tissen dad82aa1eb Gui logging in main thread
Do the logging to the GUI log element in the main thread. Not doing this
causes issues with the GTK backend of wxWidgets. Plus it's just common
sense to try to limit gui calls to one thread.
2014-04-02 17:57:50 +02:00
Peter Tissen 748aa6fce8 fix indentation 2014-04-01 20:27:58 +02:00
Peter Tissen 373ae6b107 remove dummy alias in strfmt. Fix some wxString remnants, that only make problems in Linux 2014-04-01 20:13:22 +02:00
Peter Tissen 69352206b6 blantant test code removal well this is embarassing, VS didn't recompile it, so I didn't notice the mistake 2014-04-01 19:44:38 +02:00
Peter Tissen 02729695ff remove some wxString references I missed 2014-04-01 19:25:22 +02:00
Peter Tissen bcb9ad94c1 correct some merge error that happened from automatic git merging 2014-04-01 19:19:51 +02:00
Peter Tissen febe8624bf remove redundant c_str -> string -> c_str conversions 2014-04-01 17:22:57 +02:00
Peter Tissen 8ac226ae69 replace all instances of wxString with std::string in all cases not
directly involved in either the GUI or other wxWidget classes like wxFile
2014-04-01 16:23:03 +02:00
Peter Tissen b1894ac6cb fix implicit conversion error 2014-03-31 17:35:05 +02:00
Peter Tissen 8a000940da upgrade to VS2013 to use variadic templates for type safe printing 2014-03-31 17:35:04 +02:00
Peter Tissen f0e73a652f stswi and lswi instructions 2014-03-20 02:48:02 +01:00
Peter Tissen 6e4203998a Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-20 00:51:58 +01:00
Peter Tissen 5a1ce28105 fix carry errors 2014-03-19 23:40:49 +01:00