Commit graph

190 commits

Author SHA1 Message Date
elisha464 62f9d454eb Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-11 21:00:21 +02:00
Alexandro Sánchez Bach 5c563d04c7 Merge pull request #99 from xsacha/master
Linux build fix
2014-03-11 19:29:28 +01:00
elisha464 9194b73a81 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-11 19:57:31 +02:00
Alexandro Sánchez Bach b31a990cf1 cellUserInfo module added & cellFsReadWithOffset 2014-03-11 18:40:37 +01:00
Sacha 5f3f7e197a Linux build fix. 2014-03-12 02:36:58 +10:00
Nekotekina b7b33145f6 Compilation fix 2014-03-12 02:36:58 +10:00
Alexandro Sánchez Bach d5e94d4cd9 Some sys_net functions
* sys_net; Added some functions using winsock.h | sys/socket.h
* sys_net: Renamed overloaded function/structs "*" to "sys_net_*"
* Added SetAddr function to mem_base_t
2014-03-11 15:42:28 +01:00
Lioncash 1aa6e5df95 Fix a case where an array is read out of bounds in cellSpurs.cpp 2014-03-10 03:28:17 -04:00
Alexandro Sánchez Bach 8461bee32e Updates in cellL10n and sceNpTrophy
* UTF16stoUTF8s updated.
* Added missing return in sceNpTrophyRegisterContext.
* Added sceNpTrophyGetGameInfo.
2014-03-09 04:57:19 +01:00
Nekotekina 75f535c947 Conflicts fixed 2014-03-08 03:02:59 +04:00
O1L df894c05b2 Implemented simple OpenAL audio output. Structures and enum's from cellAudio.cpp moved to cellAudio.h . Audio dump functions moved in AudioDumper class. 2014-03-08 02:15:39 +03:00
Nekotekina 1c302433af cellSpurs draft added 2014-03-08 01:31:08 +04:00
Nekotekina 3a00ec7682 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-07 16:04:14 +04:00
Nekotekina 3127543b6e sys_ppu_thread_join, sys_ppu_thread_exit fixed
Some diagnostic messages in mutexes
2014-03-07 16:03:42 +04:00
elisha464 0edd70d3d8 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-07 09:10:29 +02:00
Peter Tissen 3871134a49 respect the outputBytesPerLine parameter if it's longer than the natural length of the PNG file 2014-03-07 04:15:56 +01:00
elisha464 e32a6a2eea Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-06 19:46:23 +02:00
Alexandro Sánchez Bach 898fbf02b8 Fixes in sceNpTrophy and FSEL (PPU instr.) 2014-03-06 13:27:58 +01:00
Nekotekina 05c6a96d27 Conflicts fixed 2014-03-06 15:50:45 +04:00
Nekotekina e86a849600 libmixer draft
and some hacks
2014-03-06 15:40:50 +04:00
Alexandro Sánchez Bach d6596ca453 Progress in cellL10n
* cellL10n added to the project.
* Function addresses added to cellL10n_init.
* UTF16stoUTF8s implemented (WARNING: I haven't tested it).
2014-03-06 09:48:35 +01:00
Alexandro Sánchez Bach 39d3814be7 Changes in cellRtc & sceNpTrophy
* Two header files added: cellRtc.h and sceNpTrophy.h
* Changes in sceNpTrophyCreateContext.
* Implemented sceNpTrophyGetTrophyInfo.
2014-03-06 01:52:23 +01:00
Nekotekina 384536ba4f prx_mem memory leak fixed
CPUThread::ExecAsCallback (experimental)
2014-03-04 23:18:17 +04:00
Alexandro Sánchez Bach 8204deaae6 Minor changes
* Fixed some forgotten `!` in cellFsGetFreeSize.
* Fixed VSUM2SWS opcode.
* Added cellNetCtl to the project.
* Implemented cellNetCtlGetState.
2014-03-04 15:40:15 +01:00
Nekotekina b32a8e2e28 Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-04 03:36:45 +04:00
Nekotekina 8a4c67deab It can play video, but it can't
I don't know how to disable aggressive data caching that occures in
vdecRead(). Also ReleaseAu function is disabled because it breaks
everything.
2014-03-04 03:21:34 +04:00
elisha464 11571cf2a4 fix memory alignment
added eaIOMap with flags (draft)
changed gcmInit to throw an error when not being able to map to io address
2014-03-03 22:45:27 +02:00
Aishou bd45704c83 merge branch 'master' of https://github.com/DHrpcs3/rpcs3 into crypto 2014-03-03 14:42:21 +01:00
Alexandro Sánchez Bach 05db17b2b0 Fixed x64 compilation errors & cellFsGetFreeSize 2014-03-03 14:16:42 +01:00
Nekotekina c064c701e2 cellAdec draft 2014-03-03 03:02:42 +04:00
Aishou bea8be29d5 get ffmpeg working with cmake.. 2014-03-02 12:55:20 +01:00
Aishou 7a1d44b552 Merge https://github.com/Nekotekina/rpcs3 2014-03-02 11:57:17 +01:00
Nekotekina c978fe377d Merge branch 'master' of https://github.com/DHrpcs3/rpcs3 2014-03-02 10:24:18 +04:00
Nekotekina 9e62b330b1 I cannot do anything 2014-03-02 03:50:47 +04:00
Aishou e0d3f1cae6 Merge remote-tracking branch 'upstream/master' 2014-03-01 19:59:36 +01:00
Alexandro Sánchez Bach 7f7ad1b661 Few functions added
* sceNpManagerGetStatus
* sys_mmapper_free_memory
* Minor changes in sys_mmapper_allocate_memory
* Changed the layout of the sys_vm functions in SysCalls.cpp
2014-03-01 19:33:39 +01:00
Alexandro Sánchez Bach cd10dca71f RPCS3 arguments, TTY to file & sceNpTrophy stuff 2014-03-01 19:33:38 +01:00
Nekotekina 17fa60c31c Vpost draft 2014-03-01 12:38:50 +04:00
Nekotekina dbdae77780 Some errors fixed 2014-02-27 22:25:32 +04:00
Nekotekina 8b952bf98c memcpy partially replaced
Fixed one of exit issues
2014-02-26 18:06:13 +04:00
Aishou f85420b343 small compile fixes 2014-02-26 14:24:41 +01:00
Nekotekina 8bd0ee875c Fixed conflicts 2014-02-26 15:27:06 +04:00
Nekotekina 8048c70bc8 cond/lwcond fixed 2014-02-26 14:35:30 +04:00
Nekotekina 0bd5dc5363 Demuxer improved, cellPamf improved
File reading improved
2014-02-26 11:51:00 +04:00
Alexandro Sánchez Bach 2827db0e2a Using be_t in some cellGcm structs & minor fixes
* Using be_t in CellGcmControl, CellGcmConfig, CellGcmContextData and
CellGcmTileInfo.
* Fixed wrong names in Emu/SysCalls/Modules/sceNp.cpp
* Fixed ConLog's mount info strings in System.cpp
2014-02-24 17:03:47 +01:00
Peter Tissen 1908286e7c make things compile under windows again, there's still some ugly ifdefs
I'd like to get rid of
2014-02-24 01:51:55 +01:00
Nekotekina a14276abf1 Work on demuxer, ffmpeg libs linked 2014-02-24 04:00:42 +04:00
Bigpet 92fb77d50e more merge fixes, I should really compile it before submitting a pull request 2014-02-23 20:40:12 +01:00
Bigpet 1be8563fdb fix small merge mistake 2014-02-23 18:21:10 +01:00
Bigpet 9a30ce5f18 Make buildable with GCC in Linux
* replace GetThreadID with std::this_thread.getId()
* name all anonymous structs and unions that contain non-trivially constructable objects
* made default constructor for big endian type noexcept to make it work with std::atomic
* move instantiated specialized template function members ouside of the class definition to comply with the standard
* added default instantiation for template parameter "=nullptr"
* used the C++11 standardized thread_local instead of the __declspec(thread)
* added transitional definitions to bridge the microsoft specific calls (compare and exchange and aligned alloc)
* removed cyclic dependency between Emulator->CPUThreadManager->CPUThread->SMutex->Emulator->...
* fixed some instances of indentation by space instead of tabs
* surrounded some unused code with an #if 0 block to make sure it doesn't compile
2014-02-23 17:52:52 +01:00