stuff/suyu
stuff/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu.git synced 2024-11-25 04:46:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
1890 commits 22 branches 3 tags 304 MiB
Commit graph

1611 commits

Author SHA1 Message Date
Subv
115a4bfc9e citra-qt: Add explicit casts to prevent some warnings. 2015-01-10 15:55:52 -05:00
Subv
1b01938767 citra-qt: Fixed some Qt errors on initialization 2015-01-10 15:35:26 -05:00
bunnei
5a4b361f60 Merge pull request #455 from yuriks/handle-reform3 
Kernel Lifetime Reform Pt. 3
 2015-01-10 15:19:21 -05:00
bunnei
e7d2118858 Merge pull request #342 from uppfinnarn/master 
Build improvements
 2015-01-10 02:03:07 -05:00
Yuri Kunde Schlesner
8ad41775cc Kernel: Start using boost::intrusive_ptr for lifetime management 2015-01-09 19:43:52 -02:00
Yuri Kunde Schlesner
d751de7341 Kernel: Don't re-assign object's handle when duplicating one 2015-01-09 19:43:51 -02:00
bunnei
6ae12424df Merge pull request #444 from yuriks/handle-reform2 
Kernel Lifetime Reform Pt. 2
 2015-01-09 12:59:35 -05:00
bunnei
86e07124ad Merge pull request #436 from kevinhartman/system-core 
Warn if a new thread is intended to be run on the system CPU core
 2015-01-09 11:14:35 -05:00
Johannes Ekberg
d7ad14ae20 Use -pthread where and only where needed 
Passing -pthread to GCC as a flag makes it both link to libpthread, and make C standard library routines reentrant. This makes the additional explicit links unnecessary.

Additionally, on OSX, this is the default behavior, and clang will print a message about it being unused if it's present there.
 2015-01-09 15:50:46 +01:00
Johannes Ekberg
7d7ab70279 Generic PLATFORM_LIBRARIES var 
This both reduces redundancy in add_executable definitions, and makes it easier to link additional libraries. In particular, extra libraries are needed on OSX - see next commit.
 2015-01-09 15:50:46 +01:00
Yuri Kunde Schlesner
78ea76e12f Thread: Fix nullptr access in a logging function 2015-01-09 04:02:28 -02:00
Yuri Kunde Schlesner
7f1557fbbd Thread: Rename thread_queue => thread_list 2015-01-09 04:02:17 -02:00
Yuri Kunde Schlesner
9bf8462b96 Thread: Reduce use of Handles and move some funcs to inside the class. 2015-01-09 04:02:15 -02:00
Yuri Kunde Schlesner
ba72208cd4 Kernel: Move Thread's definition to the header file 2015-01-09 03:51:55 -02:00
Yuri Kunde Schlesner
7b3452c730 Move ThreadContext to core/core.h and deal with the fallout 2015-01-09 03:51:55 -02:00
bunnei
d46f650036 Merge pull request #255 from Subv/cbranch_3 
Implemented timers
 2015-01-08 22:38:33 -05:00
Subv
40c1439c34 Core: Fixed a crash and removed some unused variables. 
ARM_Disasm only has static methods, so there's no need to have an instance of it.
 2015-01-08 21:49:41 -05:00
Subv
07044651ef SVC: Implemented the Timer service calls. 2015-01-08 21:22:14 -05:00
Subv
fc842963c8 DynCom: Add a comment to GetTicks. 2015-01-08 19:46:00 -05:00
Subv
620d77b7e3 Timing: Use CoreTiming::GetTicks to keep track of ticks. 
This will keep track of idle ticks for us, and fixes some tickcount-related issues
 2015-01-08 19:39:14 -05:00
bunnei
cf1bbe8705 Merge pull request #443 from Subv/sleep_thread 
SVC: Fixed SleepThread
 2015-01-08 18:45:35 -05:00
Subv
dfc440785a SVC: Fixed SleepThread. 
It will now properly wait the specified number of nanoseconds and then wake up the thread.
 2015-01-08 18:39:12 -05:00
bunnei
2432f317e4 Merge pull request #446 from lioncash/umaal 
dyncom: Fix UMAAL
 2015-01-08 11:22:20 -05:00
Lioncash
1cef6e92d5 dyncom: Fix UMAAL 
These need to be done as a 64-bit operation.
 2015-01-08 11:09:21 -05:00
bunnei
72915423c3 Merge pull request #441 from Kingcom/CallStack 
Add check for valid address to call stack
 2015-01-07 21:00:46 -05:00
Subv
60a373a786 Threads: Use a dummy idle thread when no other are ready. 
This thread will not actually execute instructions, it will only advance the timing/events and try to yield immediately to the next ready thread, if there aren't any ready threads then it will be rescheduled and start its job again.
 2015-01-07 20:31:31 -05:00
bunnei
b659cac2dc Merge pull request #404 from bunnei/more-frame-synch-fixes 
GPU: Toggle active framebuffer each frame
 2015-01-07 18:13:48 -05:00
bunnei
f7a3f45f1e GSP: Toggle active framebuffer each frame 2015-01-07 18:06:00 -05:00
bunnei
e6864a1f41 Merge pull request #431 from yuriks/thread-queue-cleanup 
Common: Clean up ThreadQueueList
 2015-01-07 17:58:31 -05:00
Kevin Hartman
63be6aaadd Warn if a new thread is intended to be run on the system CPU core until we implement correct scheduling for such a thread. 2015-01-07 14:14:48 -08:00
bunnei
4c583732f2 Merge pull request #442 from lioncash/smul 
dyncom: Fix SMULWB/SMULWT
 2015-01-07 16:49:30 -05:00
Lioncash
df5e0f9f28 dyncom: Fix SMULWB/SMULWT 
Wasn't doing proper sign-extension
 2015-01-07 16:41:08 -05:00
Kingcom
693f6c54e5 citra-qt: Add check for valid address to call stack 2015-01-07 21:39:40 +01:00
Yuri Kunde Schlesner
122c2bb324 Common: Clean up ThreadQueueList 
Replace all the C-style complicated buffer management with a std::deque.
In addition to making the code easier to understand it also adds support
for non-POD IdTypes.

Also clean the rest of the code to follow our code style.
 2015-01-07 18:38:25 -02:00
bunnei
3eca33c6a4 Merge pull request #425 from Subv/coretiming 
Ported the CoreTiming namespace from PPSSPP
 2015-01-07 15:30:46 -05:00
Subv
9bf82beb4c CoreTiming: Ported the CoreTiming namespace from PPSSPP 
Implemented the required calls to make it work.

CoreTiming: Added a new logging class Core_Timing.
 2015-01-07 15:08:35 -05:00
Yuri Kunde Schlesner
a6ad68190f Fix double-free in Service manager during shutdown 
Fixes #423.
 2015-01-07 17:32:31 -02:00
bunnei
317fe1e528 Merge pull request #438 from lioncash/swp 
dyncom: Fix SWPB
 2015-01-07 09:53:29 -05:00
bunnei
5ae3a9657d Merge pull request #434 from lioncash/sm 
dyncom: Move over SMLALXY
 2015-01-07 09:51:06 -05:00
Lioncash
75c211c10f dyncom: Fix SWPB 2015-01-07 09:36:06 -05:00
Lioncash
511e13f3e3 dyncom: Move over SMLALXY 2015-01-07 00:53:56 -05:00
bunnei
5217e3f873 Merge pull request #421 from linkmauve/remove-dead-platforms 
Remove dead platform #ifdefs to make the code more readable.
 2015-01-06 23:09:20 -05:00
bunnei
088863c921 Merge pull request #376 from Subv/arc_reorder 
Archives: Change the folder layout of some archives.
 2015-01-06 20:13:56 -05:00
Subv
8fbe5d2dca Archives/Exdata: Don't set concrete_mount_point in the ctor 2015-01-06 16:12:25 -05:00
Subv
32dbb76e00 Archives: Changed the unimplemented archives comment. 
It now refers to me as the PoC
 2015-01-06 15:34:37 -05:00
Subv
5244ac0e9c Archives: Addressed some comments 2015-01-06 15:02:30 -05:00
Emmanuel Gil Peyrot
6b411c63c9 Common: Remove dead platform #ifdefs to make the code more readable. 
Symbian, Xbox, Blackberry and iOS got removed.
FreeBSD and Android kept due to them potentially being able to run Citra in the future.
The iOS specific part also got removed from PPSSPP in order to fix a bug there.
 2015-01-06 18:57:28 +00:00
bunnei
0bf5a0bfc4 Merge pull request #402 from chrisvj/master 
Renamed all .hxx headers to .h
 2015-01-06 12:43:08 -05:00
bunnei
89bb0ecbd5 Merge pull request #417 from kevinhartman/exclusive-tag-fix 
Added exclusive reservation granule from ARMv7 spec to dyncom...
 2015-01-06 12:42:10 -05:00
chrisvj
b0a14cfe7f citra-qt: Renamed all .hxx headers to .h 2015-01-06 04:51:54 -08:00
bunnei
9c8b867d86 Merge pull request #419 from linkmauve/no-x86-specifics 
Remove x86 specifics
 2015-01-05 22:59:27 -05:00
bunnei
9eaef4e04a Merge pull request #413 from purpasmart96/serv_clean 
Services: Clean up a few things and add a few function names
 2015-01-05 22:48:58 -05:00
Kevin Hartman
8132c01830 Added exclusive reservation granule from ARMv7 spec to dyncom to protect LDR/STREX. 2015-01-05 22:29:51 -05:00
bunnei
9b83f0e158 Merge pull request #272 from rohit-n/sign-compare 
Silence some -Wsign-compare warnings.
 2015-01-05 22:10:56 -05:00
purpasmart96
379b39e583 Services: Clean up a few things and add a few function names 2015-01-05 16:07:15 -08:00
Subv
123a76c9c8 SaveDataCheck: Fixed a typo 2015-01-05 16:40:36 -05:00
bunnei
6fad32ea98 Merge pull request #422 from lioncash/bxj 
dyncom: Partially emulate BXJ
 2015-01-05 16:36:29 -05:00
Lioncash
f75def619c dyncom: Partially emulate BXJ 
Just in case some game studio let the intern write inline assembly or something.
 2015-01-05 15:55:09 -05:00
bunnei
4828d0b7af Merge pull request #416 from bunnei/fake-dsp-interrupt 
DSP: Signal (faked) interrupt on every frame.
 2015-01-05 15:51:36 -05:00
Emmanuel Gil Peyrot
66e06f65c4 Common: Use std::abs instead of abs, using abs with cmath fails on some systems. 2015-01-05 16:38:12 +00:00
Lioncash
e08a39a2f4 dyncom: Actually set the Q flag for SMLABB/SMLABT/SMLATB/SMLATT 
Easy skyeye todo fix.
 2015-01-05 10:41:02 -05:00
Emmanuel Gil Peyrot
ffe4cc9c5a Common: Remove the unused x86-specific 128-bit float type. 2015-01-05 15:03:50 +00:00
bunnei
8b1ec1a82a Merge pull request #418 from lioncash/qd 
dyncom: Implement QADD/QSUB/QDADD/QDSUB
 2015-01-05 09:59:12 -05:00
Lioncash
d00c22c706 dyncom: Implement QADD/QSUB/QDADD/QDSUB 2015-01-05 09:13:41 -05:00
bunnei
e9650f1c61 DSP: Signal (faked) interrupt on every frame. 
- Hack to work around games checking that the DSP event has been signaled by a real DSP interrupt.
 2015-01-05 00:25:37 -05:00
bunnei
cc23269ff4 Merge pull request #407 from Subv/arbiter 
AddressArbiter: Ported arbitration type 2 from 3dmoo.
 2015-01-05 00:05:50 -05:00
bunnei
81e255a411 Merge pull request #415 from Dante38490/master 
Loader: Add support for loading NCCH ROMs with the .3DS extension
 2015-01-04 23:10:04 -05:00
bunnei
96e6b2aa50 Merge pull request #408 from Subv/mutex 
Mutex: Add the calling thread to the waiting list when needed
 2015-01-04 22:55:53 -05:00
Dante38490
e674aa31af Fix correct espace 2015-01-05 04:45:09 +01:00
Dante38490
35a085d567 Add support load 3DS room 2015-01-05 04:39:42 +01:00
bunnei
26f31a2dfb Merge pull request #386 from archshift/y2ru 
Stub the y2r:u service
 2015-01-04 21:40:58 -05:00
bunnei
ecf390b327 Merge pull request #406 from chrisvj/license-headers 
citra-qt: Added license headers to files.
 2015-01-04 21:39:07 -05:00
Subv
ea80363cc2 Mutex: Add the calling thread to the waiting list when needed 
This will happen when the mutex is already owned by another thread. Should fix some issues with games being stuck due to waiting threads not being awoken.
 2015-01-04 12:52:34 -05:00
chrisvj
6dfcf2271b citra-qt: Added license headers to files. 2015-01-04 09:36:57 -08:00
Lioncash
41e1cb12e5 skyeye: Remove duplicate typedefs 
citra already has its own typedefs like this.
 2015-01-04 12:34:02 -05:00
Subv
90dffe3fc1 Archives: Make SYSTEM_ID and SDCARD_ID strings 2015-01-04 09:10:27 -05:00
Yuri Kunde Schlesner
cdde76f2aa Frontends: Shutdown core when emulation is stopped 2015-01-04 01:04:46 -02:00
Subv
71a063f45c Archives: Changed the way paths are built for the archives. 
Each archive now takes a mount point of either NAND or SDMC, and builds its own directory structure there, trying to simulate an HLE-friendly hardware layout
 2015-01-03 20:46:05 -05:00
Subv
cfd7b219f6 SaveDataCheck: Move the files to nand/title 
under /nand/title/high/low/content/00000000.app.romfs
 2015-01-03 19:01:46 -05:00
Yuri Kunde Schlesner
930e13cb2c FileSys: Fix crash bug in DiskFile exposed by #400 2015-01-03 18:28:37 -02:00
archshift
48130b1eaa Stub the y2r:u service 2015-01-03 16:42:39 -03:00
Yuri Kunde Schlesner
19b2e739c5 FileSys: Fix a few memory leaks 2015-01-03 17:16:16 -02:00
Subv
0276a75f24 AddressArbiter: Ported arbitration type 2 from 3dmoo. 
(Thanks 3dmoo!)
 2015-01-03 12:09:11 -05:00
bunnei
edbb47d967 Merge pull request #396 from bunnei/default-dyncom 
Core: Change default CPU to dyncom.
 2015-01-03 11:59:42 -05:00
bunnei
caa6d431ee Merge pull request #398 from lioncash/sm 
dyncom: Implement SMLAW
 2015-01-03 11:47:01 -05:00
Lioncash
6adc0a4622 dyncom: Implement SMLAW 2015-01-03 03:13:49 -05:00
bunnei
b11518c272 VFP: Minor cleanup, functionally the same. 2015-01-03 01:22:38 -05:00
bunnei
dd21f986b8 Merge pull request #395 from lioncash/rev 
dyncom: Implement REVSH
 2015-01-02 22:44:39 -05:00
Lioncash
2f19acf064 dyncom: Implement REVSH 
Also joins the REV ops into one common place.
 2015-01-02 22:40:43 -05:00
bunnei
853b46c681 Core: Change default CPU to dyncom. 2015-01-02 22:33:53 -05:00
Lioncash
e0e54f55d7 dyncom: Implement SMLALD/SMLSLD 2015-01-02 22:08:26 -05:00
Subv
3bc9f5509b Archives: Change the folder layout of some archives. 
This is to better represent the hardware layout, they are still aren't quite accurate, but this better and will help a bit when implementing the other archives like NAND-RO and NAND-RW
 2015-01-02 21:55:13 -05:00
bunnei
031237e52c Merge pull request #381 from Subv/savedatacheck 
Implemented the SaveDataCheck archive
 2015-01-02 21:50:57 -05:00
bunnei
3e230d6c9e Merge pull request #392 from lioncash/sm 
dyncom: Implement SMMLA/SMMUL/SMMLS
 2015-01-02 21:47:53 -05:00
Lioncash
64161bcb41 dyncom: Implement SMMLA/SMMUL/SMMLS 2015-01-02 21:40:29 -05:00
Subv
22cfa55302 IVFCArchive: Use a critical log to notify of invalid operations. 2015-01-02 21:39:31 -05:00
Subv
0d03fdec71 SaveDataCheck: Remove unneeded constructor from a class 2015-01-02 21:28:46 -05:00
Subv
2f9a2d410d Archives: Added some documentation to IVFCArchive 2015-01-02 21:13:55 -05:00
Subv
aade417b14 Archives: Reduced duplicate code in RomFS and SaveCheck. 
Fixed a few warnings and cleaned up the code
 2015-01-02 21:13:54 -05:00
Subv
13efbdc201 SaveDataCheck: Preliminary work in this archive. 
This allows Steel Diver to boot further, some files are needed.

This is still not ready and needs a big cleanup, this will possibly be delayed until the way we handle archives is fixed (with factory classes instead of ahead-of-time creation of archives)
 2015-01-02 21:13:53 -05:00
bunnei
3d9bf13439 Merge pull request #391 from lioncash/pedantic 
archive/elf: Minor misc changes.
 2015-01-02 21:04:49 -05:00
bunnei
dd8a57cb80 dyncom: Implemented LDREXD/STREXD/LDREXH/STREXH 2015-01-02 20:51:54 -05:00
bunnei
3b2da87080 Merge pull request #390 from lioncash/wut 
dyncom: Remove dead function InterpreterInitInstLength
 2015-01-02 20:40:29 -05:00
bunnei
6ae381ac9e Merge pull request #388 from lioncash/sm 
dyncom: Implement SMLAD/SMUAD/SMLSD/SMUSD
 2015-01-02 20:39:36 -05:00
Lioncash
bf23f94571 elf: Make DidRelocate const 2015-01-02 20:32:16 -05:00
Lioncash
0d81b1e75b archive: Fix initializer list order 2015-01-02 20:30:57 -05:00
Lioncash
67187c15a0 dyncom: Remove dead function InterpreterInitInstLength 
Technically eliminates two memory leaks as well.
 2015-01-02 20:24:00 -05:00
Lioncash
bdbd111c7e soc_u: Fix a missing formatting argument 2015-01-02 19:54:21 -05:00
Lioncash
bee4ff8454 armemu: Fix missing Q flag check for SMLSD. 2015-01-02 18:29:36 -05:00
Lioncash
3337b84620 dyncom: Implement SMLAD/SMUAD/SMLSD/SMUSD 2015-01-02 18:29:30 -05:00
bunnei
092a67cefb Merge pull request #382 from lioncash/sx 
dyncom: Implement SXTAB16 and SXTB16
 2015-01-02 11:50:01 -05:00
Tony Wasserka
27406cc377 Merge pull request #377 from Yllodra/misc-changes 
Qt: Letter cases and single window mode
 2015-01-02 14:49:50 +01:00
Lioncash
48bf0f9996 dyncom: Implement SXTAB16 and SXTB16 2015-01-01 21:59:37 -05:00
bunnei
7c8f6ca051 Merge pull request #358 from neobrain/pica_progress2 
pica_progress followups
 2015-01-01 20:54:45 -05:00
bunnei
fa4cc502e7 Merge pull request #379 from lioncash/sh 
dyncom: Implement SHADD8/SHADD16/SHSUB8/SHSUB16/SHASX/SHSAX
 2015-01-01 20:43:04 -05:00
bunnei
3e566be052 Merge pull request #378 from lioncash/s8 
dyncom: Implement SADD8/SSUB8
 2015-01-01 20:41:51 -05:00
Rohit Nirmal
c589d82052 Silence some -Wsign-compare warnings. 2015-01-01 16:38:36 -06:00
Daniel Lundqvist
85c150a4fd Make letter cases consistent in menus and widgets 
In various menu options letter cases were not consistent. This was also
the case within various debugging widgets. This attempts to make letter
cases consistent, but it is of course a matter of opinion which way is the
correct one.
 2015-01-01 18:52:39 +01:00
Daniel Lundqvist
3f3b890694 Change popout mode to "Single Window Mode" 2015-01-01 18:50:56 +01:00
Lioncash
524da47698 dyncom: Implement SHADD8/SHADD16/SHSUB8/SHSUB16/SHASX/SHSAX 2015-01-01 10:34:20 -05:00
Lioncash
481a6c9652 Fix SADD8/SSUB8 in the armemu 2015-01-01 09:44:32 -05:00
Lioncash
4e2cb06b81 dyncom: Implement SADD8/SSUB8 2015-01-01 09:39:40 -05:00
Daniel Lundqvist
a35e3a8632 Set object name for the graphics debugger 
Setting an object name for GPUCommandStreamWidget allows for saving the
graphics debugger's state (if it's show, position, etc). This state is
then restored when restarting the application.
 2015-01-01 14:49:35 +01:00
Subv
97a7381d29 SOC_U: Preliminary implementation of sockets. 
Stubbed CreateMemoryBlock

Using Berkeley sockets, and Winsock2.2 on Windows.
So far ftpony creates the socket and accepts incoming connections

SOC_U: Renamed functions to maintain consistency

Also prevents possible scope errors / conflicts with the actual Berkeley socket functions

SOCU: Close all the opened sockets when cleaning up SOCU
 2014-12-31 10:51:44 -05:00
Tony Wasserka
bc187be0c1 Pica/Rasterizer: Remove some redundant casts. 2014-12-31 16:32:56 +01:00
Tony Wasserka
9675d19b47 Pica/Rasterizer: Make orient2d a free function and rename it to SignedArea. 2014-12-31 16:32:56 +01:00
Tony Wasserka
47543d62cf Pica: Cleanup color conversion. 2014-12-31 16:32:55 +01:00
Tony Wasserka
614baa39d1 VideoCore: Remove some unused functions. 2014-12-31 16:32:55 +01:00
Tony Wasserka
d13bd327ba Pica/Rasterizer: Fix a bug related to multitexturing and texture wrapping. 2014-12-31 16:32:55 +01:00
Tony Wasserka
195d73a385 Pica/Rasterizer: Clean up long code lines. 2014-12-31 16:32:55 +01:00
Tony Wasserka
40c7200841 Pica/VertexShader: Coding style fixes. 2014-12-31 16:32:55 +01:00
Tony Wasserka
323a56f898 Pica/CommandProcessor: Cleanups. 2014-12-31 16:32:55 +01:00
Tony Wasserka
b2d461020d Pica/CommandProcessor: Workaround games not setting the input position's w component. 2014-12-31 16:32:55 +01:00
Tony Wasserka
18a5e888bb GPU: Pseudo-implement horizontal scaling. 
It's not really known how this actually works. Some testing has shown that this probably performs no filtering, and common usage in games suggests it's not actually resizing the image at all.
However, this patch does seem to fix some homebrew showing quasi-duplicated images while still keeping other applications in a working state.
 2014-12-31 16:32:55 +01:00
Tony Wasserka
0f49424022 Pica/Rasterizer: Implement backface culling. 2014-12-31 16:32:55 +01:00
Tony Wasserka
3b78af904e Pica/Rasterizer: Textures seem to be laid out flipped vertically. 
Not sure if this is a correct fix. Probably should instead change the decoding logic itself.
 2014-12-31 16:32:55 +01:00
Tony Wasserka
3da52ead9b Pica/DebugUtils: Fix a bug in RGBA4 texture decoding. 2014-12-31 16:32:55 +01:00
Tony Wasserka
a7ae0330b1 Pica/Rasterizer: Implement alpha blending. 2014-12-31 16:32:55 +01:00
Tony Wasserka
e229ff8c83 Pica/Rasterizer: Implement depth testing. 2014-12-31 16:32:55 +01:00
bunnei
59bba04628 Merge pull request #375 from lioncash/uops 
dyncom: Implement UADD8/UADD16/USUB8/USUB16/UASX/USAX
 2014-12-31 10:14:37 -05:00
Tony Wasserka
77bb58afeb Pica/Rasterizer: Further enhance Tev support. 2014-12-31 15:35:54 +01:00
Tony Wasserka
36291bc3f6 Pica: Add output merger definitions. 2014-12-31 15:35:54 +01:00
Tony Wasserka
632655e292 Pica: Fix A4, IA4 and IA8 texture formats. 
Both IA4 and IA8 had their component order mixed up. Additionally, IA4 used the wrong number of nibbles per texel. A4 skipped every second texel.
 2014-12-31 15:35:24 +01:00
Tony Wasserka
b7a48c422a Pica/CommandProcessor: Add support for integer uniforms. 2014-12-31 15:33:09 +01:00
Tony Wasserka
b03a97e0b8 citra-qt: Fix displaying RGBA5551 framebuffers. 
(not that it matters at the moment, because this code is not used yet)
 2014-12-31 15:33:09 +01:00
Tony Wasserka
e1144e364e citra-qt: Always show pica framebuffers as RGBA8. 
We actually don't really know yet how the format is encoded. Hence just use what works.
 2014-12-31 15:33:09 +01:00
Lioncash
3cc4af99d1 dyncom: Implement UADD8/UADD16/USUB8/USUB16/UASX/USAX 2014-12-31 06:45:41 -05:00
bunnei
746fcf5a59 Merge pull request #338 from chinhodado/master 
Add citra icon to executable and window title in Windows
 2014-12-31 00:47:06 -05:00
Chin
3aeb5970e5 Add citra icon to Windows executable and title bar 2014-12-31 00:38:03 -05:00
bunnei
631f13e462 dyncom: Massive refactor 2014-12-30 23:56:45 -05:00
bunnei
29da5da951 Merge pull request #369 from darkf/mingw_ 
Fix MinGW build (2)
 2014-12-30 23:54:02 -05:00
Lioncash
5894c407c2 vfp: Get rid of a few warnings 2014-12-30 13:08:56 -05:00
Lioncash
6ce4b7b666 vfp: Implement VMOVBRRSS 2014-12-30 11:04:22 -05:00
Lioncash
cc9f458ad3 dyncom: Implement USAT16/SSAT16 2014-12-30 09:43:24 -05:00
darkf
5d10b212ec Fix MSVC-related #defines and add CMakeLists comment 2014-12-29 20:12:03 -08:00
bunnei
b3240f6455 Merge pull request #368 from purpasmart96/dsp_mem 
MemMap: Add support for DSP Read & Writes in the memory map
 2014-12-29 23:08:51 -05:00
Subv
545ded954d APT:A: Some style changes 2014-12-29 22:59:28 -05:00
darkf
8ba9ac0f74 Fix merge conflicts 2014-12-29 19:47:41 -08:00
purpasmart96
d5049cbba5 MemMap: Add support for DSP Read & Writes in the memory map 2014-12-29 19:35:06 -08:00
Subv
2c89d4d5cd Archives: Implemented ExtSaveData and SharedExtSaveData 
They will be stored in /extsavedata/SDMC and /extsavedata/NAND respectively.
Also redirect some APT_A functions to their APT_U equivalents.
Implemented the gamecoin.dat file in SharedExtSaveData in the PTM module.
Implemented formatting the savegame.
Retake a previous savegame if it exists instead of reporting them as not formatted every time a game is loaded.
 2014-12-29 22:29:55 -05:00
bunnei
021fb42075 dyncom: Implement USAT/SSAT 2014-12-29 22:15:15 -05:00
bunnei
78bb86293f Merge pull request #253 from purpasmart96/mem_map 
MemMap: Removed I/O address's and added more stuff
 2014-12-29 21:57:04 -05:00
bunnei
c2f41f0404 Merge pull request #362 from bunnei/dyncom-cleanup 
dyncom: Various cleanups to match coding style, no functional changes.
 2014-12-29 21:53:49 -05:00
bunnei
dedbdb2dfb Merge pull request #344 from Yllodra/Qt-Oddities 
Allow focus on the Qt render widget
 2014-12-29 21:52:38 -05:00
bunnei
aa49019afb dyncom: Various cleanups to match coding style, no functional changes. 2014-12-29 21:50:47 -05:00
Tony Wasserka
b7e0b16354 Merge pull request #351 from yuriks/optimize 
Rasterizer Optimizations
 2014-12-30 00:13:48 +01:00
bunnei
2d2aa2c0be Merge pull request #361 from lioncash/moreqops 
dyncom/armemu: Implement QADD8/QSUB8.
 2014-12-29 14:53:04 -05:00
Lioncash
d08d9f8747 dyncom: Fix SMLALXY's instruction labels 
They were erroneously labeled as SMLAL.
 2014-12-29 12:04:34 -05:00
Tony Wasserka
13699f05e7 Merge pull request #303 from linkmauve/fs-cleanup 
FileSys cleanup
 2014-12-29 12:14:59 +01:00
Lioncash
e412c0fc46 dyncom: Implement QADD8/QSUB8 2014-12-29 00:54:48 -05:00
Lioncash
7ad400d5a7 armemu: Implement QADD8/QSUB8 2014-12-29 00:49:10 -05:00
bunnei
472ec0d0cf Merge pull request #360 from lioncash/dynuxt 
dyncom: Implement UXTB16/UXTAB16
 2014-12-28 23:20:30 -05:00
Yuri Kunde Schlesner
8369ee5803 Rasterizer: Pre-divide vertex attributes by W 
Execute the division-by-W for perspective-correct interpolation of
values in the clipper, moving them out of the rasterization inner loop.
 2014-12-29 02:08:11 -02:00
Yuri Kunde Schlesner
fe186d3a59 GPU: Bitwise texture swizzling 
Replace the loop-based texture address swizzling code by a bit-twiddling
implementation, providing a very small speed up. Also simplify
addressing code.
 2014-12-29 02:08:11 -02:00
Yuri Kunde Schlesner
2012e1420f Rasterizer: Common sub-expression elimination 
Move the computation of some values out of loops so that they're not
constantly recalculated even when they don't change.
 2014-12-29 02:08:10 -02:00
Yuri Kunde Schlesner
7e9bc85cc8 Clipper: Compact buffers on each clipping pass 
Use a new buffer management scheme in the clipper that allows using a
bounded minimal amount of buffer space. Even though it copies more data
it is still slightly faster likely due to using less cache.
 2014-12-29 02:08:10 -02:00
Yuri Kunde Schlesner
a320d1a5b4 Clipper: Avoid dynamic allocations 
The triangle clipper was allocating its temporary input, output and work
buffers using a std::vector. Since this is a hot path, it's desirable to
use stack allocation instead.
 2014-12-29 02:08:09 -02:00
Yuri Kunde Schlesner
d151d797b1 Vertex Shader: Zero OutputVertex to avoid denormals 
Unused OutputVertex attributes were being left un-initialized. The
leftover garbage sometimes decoded as floating-point denormalized
values, causing fallbacks to microcode and massive slowdowns in the rest
of the rasterization pipeline even though the results were unused. By
zeroing the structure we ensure these attributes only contain harmless
zeros.
 2014-12-29 02:08:09 -02:00
Lioncash
5c198686ce dyncom: Implement UXTB16/UXTAB16 2014-12-28 22:45:04 -05:00
bunnei
487a80f9f7 Merge pull request #347 from bunnei/frameskip 
Frameskip
 2014-12-28 22:39:17 -05:00
bunnei
df728cb4c2 Merge pull request #355 from lioncash/simp 
armemu: Simplify some instructions.
 2014-12-28 22:20:49 -05:00
bunnei
3b9d181b8e GPU: Implement frameskip and remove forced framebuffer swap hack. 2014-12-28 22:14:05 -05:00
bunnei
5763d40319 Merge pull request #352 from xdec/PR_XDEC_172 
Qt: Citra crashes if disassembler pause button is pressed while no game is running. #172
 2014-12-28 22:00:47 -05:00
bunnei
9a403d7dfb Merge pull request #359 from lioncash/vfp 
vfp: Actually make the code somewhat readable
 2014-12-28 21:54:53 -05:00
bunnei
77363d9590 Merge pull request #331 from yuriks/handle-reform 
New Handle manager
 2014-12-28 21:11:55 -05:00
Lioncash
9c7f2570f7 vfp: Actually make the code somewhat readable 2014-12-28 18:55:01 -05:00
bunnei
bf9b33aa9f dyncom: Implement PKHBT and PKHTB. 2014-12-28 16:50:08 -05:00
bunnei
58cb62fe7b armemu: Fix PKHTB to do an arithmetic shift and correctly decode immediate field. 2014-12-28 16:18:52 -05:00
xdec
e6162ed91e Qt: we don't need to check if model is valid. 2014-12-28 10:11:51 -08:00
Lioncash
7d322b5c6f dyncom: Implement USAD8/USADA8 2014-12-28 12:40:51 -05:00
Lioncash
6ce2a38ec4 armemu: Simplify SSAT/SSAT16/SXTB/SXTAB 2014-12-28 12:19:31 -05:00
Lioncash
9f5b53f9ff armemu: Simplify REV/REV16/SXTH/SXTAH 2014-12-28 12:13:13 -05:00
bunnei
762f16c4ad Merge pull request #354 from lioncash/usaduflow 
armemu: Fix underflows in USAD8/USADA8
 2014-12-28 11:57:25 -05:00
Lioncash
914ecfe04f armemu: Simplify USAT16/UXTB/UXTAB 2014-12-28 11:57:14 -05:00
Lioncash
5e16216afb armemu: Simplify REVSH/UXTH/UXTAH 2014-12-28 11:57:09 -05:00
Yuri Kunde Schlesner
7e2903cb74 Kernel: New handle manager 
This handle manager more closely mirrors the behaviour of the CTR-OS
one. In addition object ref-counts and support for DuplicateHandle have
been added.

Note that support for DuplicateHandle is still experimental, since parts
of the kernel still use Handles internally, which will likely cause
troubles if two different handles to the same object are used to e.g.
wait on a synchronization primitive.
 2014-12-28 11:52:55 -02:00
Yuri Kunde Schlesner
23f2142009 Kernel: Replace GetStaticHandleType by HANDLE_TYPE constants 2014-12-28 11:52:53 -02:00
Yuri Kunde Schlesner
73fba22c01 Rename ObjectPool to HandleTable 2014-12-28 11:52:52 -02:00
Lioncash
059c65a27a armemu: Fix underflows in USAD8/USADA8 
Initially reported by xdec.
 2014-12-28 06:09:43 -05:00
xdec
8de09d87ab Fix crash when the disassembler pause button is pressed while no game is running. 2014-12-28 01:56:07 -08:00
Lioncash
af69b0840b dyncom: Implement UQADD8, UQADD16, UQSUB8, UQSUB16, UQASX, and UQSAX. 2014-12-27 17:24:34 -05:00
Lioncash
60523113a9 armemu: Implement UQADD8, UQADD16, UQSUB16, UQASX, and UQSAX 2014-12-27 17:06:19 -05:00
Lioncash
52d889d85d dyncom: Implement UHADD8, UHADD16, UHSUB8, UHSUB16, UHASX, and UHSAX 2014-12-27 00:57:32 -05:00
bunnei
b48ca7878b Merge pull request #348 from lioncash/uhops 
armemu: Implement UHADD8, UHADD16, UHSUB8, UHSUB16, UHASX, and UHSAX
 2014-12-27 00:34:39 -05:00
Lioncash
84a0438cf5 armemu: Implement UHADD8, UHADD16, UHSUB8, UHSUB16, UHASX, and UHSAX 2014-12-26 23:55:39 -05:00
bunnei
a2005d0657 GPU: Change internal framerate to 30fps. 2014-12-26 21:48:32 -05:00
bunnei
01c675685e Merge pull request #327 from Apology11/master 
Fix visual studio ambiguous symbol error
 2014-12-26 21:43:59 -05:00
Daniel Lundqvist
7e3f62a367 Remove duplicate work 2014-12-26 20:12:11 +01:00
Daniel Lundqvist
ba4ca041f4 Allow focus only when in popout mode 
Only allow manually setting focus to the rendering widget when in Single Window mode. Apply this behavior to when changing the mode while an app is running.
 2014-12-26 19:42:27 +01:00
bunnei
e5ddbfee02 Merge pull request #339 from bunnei/fixup-gsp-synch 
Fixup gsp synch
 2014-12-25 22:52:40 -05:00
bunnei
5d2ee78d8f Merge pull request #330 from purpasmart96/new_srv 
More services & small clean ups
 2014-12-25 22:51:38 -05:00
bunnei
5799025ac4 GPU: Further improve synchronization. 2014-12-25 22:46:55 -05:00
bunnei
4783133bbd ARM: Add a mechanism for faking CPU time elapsed during HLE. 
- Also a few cleanups.
 2014-12-25 22:46:44 -05:00
purpasmart96
9796bc1fa2 More services & small clean ups 2014-12-25 19:08:33 -08:00
bunnei
9c8ec675d9 Merge pull request #343 from lioncash/smmla 
armemu: Implement SMMUL, SMMLA, and SMMLS.
 2014-12-25 21:57:31 -05:00
bunnei
254567056f Merge pull request #341 from lioncash/moresmops 
armemu: Implement SMLALD/SMLSLD
 2014-12-25 21:46:54 -05:00
Daniel Lundqvist
9d90b26020 Allow focus on the Qt render widget 
By default widgets are set to the focus policy Qt::NoFocus which disallows manually focusing it. Changing the policy to allow clicking the widget to set focus to it allows for keyboard input when not rendering to a popout window. This commit also sets focus to the widget when showing it.

Fixes issue #158.
 2014-12-26 02:37:52 +01:00
Lioncash
35dbfc7ab0 armemu: Implement SMMUL, SMMLA, and SMMLS. 2014-12-25 13:52:46 -05:00
Lioncash
82c3962b95 armemu: Implement SMLALD/SMLSLD 2014-12-24 09:29:48 -05:00
Lioncash
6b7808e412 armemu: Fix GE/Q flag setting semantics 2014-12-24 07:56:57 -05:00
Emmanuel Gil Peyrot
bbe0bf1332 FileSys: Clean up according to the coding style, and remove redundant namespaced names. 2014-12-24 01:49:48 +00:00
bunnei
2bbbe68399 Merge pull request #328 from archshift/writeable 
Stubbed IsSdmcWriteable to always return writeable.
 2014-12-23 20:41:51 -05:00
archshift
81a538ccc2 Stubbed IsSdmcWriteable to always return writeable. 2014-12-23 22:22:48 -03:00
Lioncash
20fc5f2a35 armemu: Set the Q flag correctly for much of the other ops 
They were setting the old S flag.
 2014-12-23 09:59:37 -05:00
Lioncash
79a7a432c5 armemu: Set the Q flag properly for SMLAD/SMUAD 2014-12-23 09:58:21 -05:00
bunnei
d31a94f06b Merge pull request #334 from lioncash/cpsr 
armemu: Fix retrieval of the CPSR in MRS instructions.
 2014-12-23 09:44:04 -05:00
bunnei
53447da142 Merge pull request #335 from lioncash/cpsrcreate 
armemu: Emulate the GE and Q flags.
 2014-12-23 09:43:46 -05:00
Lioncash
6446331938 armemu: Properly set the Q flag for SSAT16/USAT16 upon saturation. 2014-12-22 23:52:05 -05:00
Lioncash
f66d356938 armemu: Fix SEL 
Needs to use the updated state of the CPSR.
 2014-12-22 23:52:05 -05:00
Lioncash
8e2accd974 armemu: Fix construction of the CPSR 2014-12-22 23:51:59 -05:00
Lioncash
8c72322422 armemu: Fix retrieval of the CPSR in MRS instructions. 2014-12-22 21:44:03 -05:00
bunnei
949d95659e Merge pull request #275 from yuriks/cmake-clean 
Clean up CMake library specification
 2014-12-22 11:11:37 -05:00
Lioncash
97f3e884d2 dyncom: Move over QADD16/QASX/QSAX/QSUB16 2014-12-22 01:09:42 -05:00
bunnei
2188af4a65 Merge pull request #322 from chinhodado/master 
More warning cleanups
 2014-12-22 00:12:43 -05:00
bunnei
ae76469373 Merge pull request #332 from lioncash/sel 
dyncom: Move SEL over
 2014-12-21 21:49:45 -05:00
bunnei
ec1ddc17e2 Merge pull request #312 from Subv/still_more_savedata_stuff 
CFG: Implemented the GetConfigInfoBlk2 function.
 2014-12-21 21:47:25 -05:00
Lioncash
245276c9cc dyncom: Move SEL over 2014-12-21 21:19:15 -05:00
bunnei
770b274c86 Merge pull request #324 from lioncash/dync 
dyncom: Move over SASX/SSAX/SADD16/SSUB16
 2014-12-21 20:33:14 -05:00
Lioncash
c6f27055c9 dyncom: Move over SASX/SSAX/SADD16/SSUB16 2014-12-21 19:50:36 -05:00
Subv
2030f9d946 CFG: Fixed some warnings and errors in Clang 2014-12-21 18:25:49 -05:00
Subv
304735fb52 CFG: More style changes 2014-12-21 18:02:27 -05:00
Subv
f080e3ccfa CFGU: Indentation 2014-12-21 17:54:14 -05:00
Subv
6f304d3b00 CFG: Some indentation 2014-12-21 17:41:35 -05:00
Subv
b3cee19289 CFG: Changed the CreateConfigInfoBlk search loop 2014-12-21 17:26:51 -05:00
Subv
3e94b9054c CFG: Corrected the licenses in cfg_i.cpp and cfg_u.cpp 2014-12-21 16:45:13 -05:00
Subv
6115f013a9 CFG: Create a new subfolder cfg inside service to handle cfg 
Moved most of the shared CFG code there, implemented a few CFG:I functions
 2014-12-21 16:41:06 -05:00
Subv
9e45240e23 CFGU: Some changes 2014-12-21 16:39:29 -05:00
Subv
cdd78fa01d CFGU: Addressed some issues. 2014-12-21 16:39:26 -05:00
Subv
718a120754 CFGU: Addressed some comments. 2014-12-21 16:39:23 -05:00
Subv
a1b9b80a55 Style: Addressed some comments 2014-12-21 16:39:20 -05:00
Subv
a7cc7972de CFG_U: Use Common::make_unique instead of the std version 2014-12-21 16:39:17 -05:00
Subv
9029efd873 CFG:U: Implemented some more blocks 2014-12-21 16:39:14 -05:00
Subv
8b0ee93526 CFG: Implemented block 0x00070001 in the config savefile 2014-12-21 16:39:11 -05:00
Subv
b3d1c8ba6a CFGU: Use an absolute offset in the config savefile blocks 2014-12-21 16:39:08 -05:00
Subv
95ca6ae1e1 CFG: Load the Config savedata file if it already exists. 2014-12-21 16:39:05 -05:00
Subv
b49bdb6ba7 CFGU: Added block 0x000A0002 to the default savegame file 
That's the language id block, we're using LANGUAGE_EN for now. This block allows some games to boot further
 2014-12-21 16:39:02 -05:00
Subv
4cd21b43c1 CFG: Refactored how the config file works. 
It is now kept in memory as per 3dbrew, all updates happen on memory, then they can be saved using UpdateConfigNANDSavegame.
 2014-12-21 16:38:59 -05:00
Subv
462740278d CFG:U: Add some data to the 0x00050005 config block. 
Seems to allow some games to boot further, thanks @Normmatt for sharing this information
 2014-12-21 16:38:57 -05:00
Subv
fa3d72ab3e CFG: Implemented the GetConfigInfoBlk2 function. 
Added a "config" file to the CFG process service (CFG:U), and added a few default blocks to it.

Implemented GetSystemModel and GetModelNintendo2DS
 2014-12-21 16:38:54 -05:00
bunnei
0de6a08d75 Merge pull request #291 from purpasmart96/license 
License change
 2014-12-21 16:05:44 -05:00
Apology11
8d81e23d6e Fix visual studio ambiguous symbol error 2014-12-21 18:34:20 +01:00
Chin
0199a7d9ef More warning cleanups 2014-12-21 10:58:55 -05:00
bunnei
572ce043c2 Merge pull request #271 from archshift/createf 
Added CreateFile to the FS_USER service
 2014-12-21 01:45:00 -05:00
archshift
0625dd09ea Added CreateFile to the FS_USER service 
Tested with hwtests.
 2014-12-21 02:21:49 -03:00
purpasmart96
ebfd831ccb License change 2014-12-20 21:20:24 -08:00
bunnei
0f696037f6 Merge pull request #323 from lioncash/saddsub 
armemu: Implement SADD8/SSUB8
 2014-12-21 00:10:12 -05:00
bunnei
4fcdbed9f6 Thread: Wait current thread on svc_SleepThread 
- Removed unused VBLANK sleep mode
- Added error log for bad context switch
- Renamed VerifyWait to CheckWaitType to be more clear
 2014-12-20 23:20:19 -05:00
Lioncash
855eda6f85 armemu: Implement SADD8/SSUB8 2014-12-20 23:10:35 -05:00
bunnei
2e5869c939 Merge pull request #316 from yuriks/thread-handle 
Kernel: Implement support for current thread pseudo-handle
 2014-12-20 16:36:01 -05:00
bunnei
0e9262885d Merge pull request #296 from lioncash/dyn 
dyncom: Implement UMAAL
 2014-12-20 16:24:12 -05:00
bunnei
993afd3bf0 Merge pull request #310 from lioncash/ssat16 
armemu: Fix SSAT16.
 2014-12-20 16:23:54 -05:00
Lioncash
2a097f0990 armemu: Should be using labs for USAD8/USADA8 2014-12-20 15:34:14 -05:00
bunnei
7095c4959b Merge pull request #311 from lioncash/usada 
armemu: Implement USAD8 and USADA8
 2014-12-20 15:21:25 -05:00
bunnei
52bc58283d Merge pull request #313 from lioncash/smlsd 
armemu: Implement SMLSD
 2014-12-20 15:18:52 -05:00
bunnei
1c50a036dd Merge pull request #314 from lioncash/qsax-qasx 
armemu: Implement QASX and QSAX
 2014-12-20 15:18:05 -05:00
Tony Wasserka
08f42c2b8c Pica/VertexShader: Promote a log message to critical status. 2014-12-20 18:06:56 +01:00
Tony Wasserka
17f31de364 Pica/VertexShader: Small optimization. 2014-12-20 18:06:56 +01:00
Tony Wasserka
a664574ecb Pica/VertexShader: Be robust against invalid inputs. 
More specifically, this also fixes crashes by Citra trying to load a src2 register even if the current instruction does not use that.
 2014-12-20 18:06:56 +01:00
Tony Wasserka
ad5db467d7 Pica/VertexShader: Clarify a comment. 2014-12-20 18:06:56 +01:00
Tony Wasserka
871418e62b Pica/DebugUtils: Further cleanups to LookupTexture. 2014-12-20 18:06:56 +01:00
Tony Wasserka
88e9efe4b8 Pica/DebugUtils: Fix two warnings. 2014-12-20 18:06:56 +01:00
Tony Wasserka
6e275778c9 Pica/DebugUtils: Better document LookupTexture. 2014-12-20 18:06:55 +01:00
Tony Wasserka
e4e9710d18 Pica/Rasterizer: Get rid of C-style casts. 2014-12-20 18:06:55 +01:00
Tony Wasserka
d81370682f Pica/DebugUtils: Make a number of variables static. 
Makes for cleaner and faster code.
 2014-12-20 18:06:55 +01:00
Tony Wasserka
6bd41de276 Pica/VertexShader: Cleanup flow control logic and implement CMP/IFU instructions. 2014-12-20 18:06:55 +01:00
Tony Wasserka
22afb9d830 Pica/VertexShader: Run instruction handlers according to the effective opcode. 
This allows for proper emulation of the different CMP/LRP/MAD instructions.
 2014-12-20 18:06:55 +01:00
Tony Wasserka
cd163fb59a Pica/VertexShader: Implement MAX instructions. 2014-12-20 18:06:55 +01:00
Tony Wasserka
aff808b2fd Pica: Add support for boolean uniforms. 2014-12-20 18:06:55 +01:00
Tony Wasserka
67618a2c55 Pica/VertexShader: Add support for MOVA, CMP and IFC. 2014-12-20 18:06:55 +01:00
Tony Wasserka
cb1804e0ab Pica/VertexShader: Move code around a bit. 2014-12-20 18:06:55 +01:00
Tony Wasserka
b85524c760 Pica/VertexShader: Some cleanups using std::array. 2014-12-20 18:06:55 +01:00
Tony Wasserka
ce36ad454e Pica/VertexShader: Support negating src2. 2014-12-20 18:06:55 +01:00
Tony Wasserka
cc5746abfe Pica/DebugUtils: Replace duplicated SHBIN structures in favor of nihstro's ones. 2014-12-20 18:06:55 +01:00
Tony Wasserka
8ce1d32460 Pica/VertexShader: Remove (now) duplicated shader bytecode definitions in favor of nihstro's ones. 2014-12-20 18:06:55 +01:00
Tony Wasserka
79c29243ed Pica/DebugUtils: Add an event triggered after loading a vertex. 2014-12-20 18:06:55 +01:00
Tony Wasserka
cd322e328e Pica/PrimitiveAssembly: Implement triangle strips. 2014-12-20 18:06:54 +01:00
Tony Wasserka
346012f29e Pica/CommandProcessor: Add a safety check for invalid (?) GPU configurations. 2014-12-20 18:06:54 +01:00
Tony Wasserka
1e960e9ee2 Pica/CommandProcessor: Fix vertex decoding if multiple memory areas are accessed for different attributes. 2014-12-20 18:06:54 +01:00
Tony Wasserka
1c972ef3b9 Add support for a ridiculous number of texture formats. 2014-12-20 18:06:54 +01:00
Tony Wasserka
40f123b7c0 Pica: Unify ugly address translation hacks. 2014-12-20 18:06:53 +01:00