H3cJP/citra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,377 Commits 7 Branches 3 Tags 145 MiB
01c4f49e75
Commit Graph

1824 Commits

Author SHA1 Message Date
wwylele
9be3ce83db
Service/PTM: convert to ServiceFramework 2018-01-10 14:23:35 +02:00
Subv
34685f48dc GSP: Allow the signaling of the PDC0/1 interrupts even if the GPU right hasn't been acquired. 
This was verified with a hwtest.
 2018-01-06 13:51:33 -05:00
Weiyi Wang
a66e4585a0
Merge pull request #3304 from wwylele/hid-new-framework 
HID: convert to ServiceFramework
 2018-01-04 11:04:57 +02:00
Subv
aa90198ec5 Services: Make SessionDataBase's destructor virtual. 2018-01-03 10:52:46 -05:00
Subv
75f68c4860 Services/GSP: Mark the thread ids as unused when a GSP session is destroyed. 
This fixes the games that call RegisterInterruptRelayQueue and UnregisterInterruptRelayQueue frequently.
 2018-01-02 12:10:58 -05:00
Subv
d17f148e48 Services/GSP: Assign a thread id to each connected session when the session is created. 
Most applications call AcquireRight before calling RegisterInterruptRelayQueue so we can't assign the thread id there.
This fixes the bug with LLE applets not launching properly.
 2018-01-02 12:07:26 -05:00
Weiyi Wang
3f7f2b42c0
Merge pull request #3257 from tgsm/y2r-ipc 
y2r: convert some functions to use IPC helper
 2018-01-02 12:55:56 +02:00
tgsm
ee779a5a4d y2r: convert some functions to use IPC helper 2018-01-01 22:46:34 -05:00
wwylele
7daa2a51d7
Kernel/SVC: fix typo in GetResourceLimitLimitValues 2017-12-30 23:42:32 +02:00
Subv
fbef978b98 GSP: Return the correct result code if AcquireRight is called multiple times from the same thread. 2017-12-24 12:15:01 -05:00
Subv
68fc3b36e6 HLE/GSP: Only trigger GSP interrupts for the current active GSP thread. 
This is true for all interrupts except PDC0 and PDC1, which should be triggered for all registered threads.

TODO: The real GSP module seems to only trigger PDC0 after updating the screens (both top and bottom). PDC1 doesn't seem to be triggered at all.
 2017-12-24 12:15:00 -05:00
Subv
05a44ed353 HLE/GSP: Keep track of the thread that currently has the GPU right. 
This thread is the only one for which the GSP interrupts should be signaled, except for the PDC0/1 interrupts.
 2017-12-24 12:14:59 -05:00
Subv
aabb07cca4 HLE/GSP: Make RegisterInterruptRelayQueue work in a per-session basis. 
The registered interrupt event is unique to each session that calls RegisterInterruptRelayQueue, and only that event should be reset when UnregisterInterruptRelayQueue is called.
 2017-12-24 12:14:58 -05:00
James Rowe
13606a6d0b Memory: Remove count of cached pages and add InvalidateRegion 
In a future commit, the count of cached pages will be reintroduced in
the actual surface cache. Also adds an Invalidate only to the cache
which marks a region as invalid in order to try to avoid a costly flush
from 3ds memory
 2017-12-23 16:10:25 -07:00
Sebastian Valle
c3c684cd2b
Merge pull request #3301 from Subv/exitprocess2 
Kernel/SVC: Partially implemented svcExitProcess.
 2017-12-23 10:49:36 -05:00
wwylele
bf23f8d542 HID: convert to ServiceFramework 2017-12-22 12:41:41 +02:00
Sebastian Valle
ae42267cc7
Merge pull request #3307 from Subv/gsp_new_frame 
HLE: Convert GSP_GPU to ServiceFramework.
 2017-12-21 10:31:41 -05:00
Subv
3652809408 HLE: Convert GSP_GPU to ServiceFramework. 
The only functional change is the error handling of GSP_GPU::ReadHWRegs function. We previously didn't return error codes (not even for success). The new returns were found by reverse engineering the GSP module.
 2017-12-21 10:30:22 -05:00
Merry
3f37976fd3
Merge pull request #3309 from wwylele/cro-session-slot 
ldr_ro: use ServiceFramework's session slot for client slot
 2017-12-18 18:22:39 +00:00
Merry
32b2d5bdfe
Merge pull request #3253 from lioncash/mic-ipc 
mic_u: Migrate to the new service framework
 2017-12-18 14:34:47 +00:00
danzel
0238e0c5e7 Convert Movie to a class with a static instance, and other fixes based on B3n30 feedback. 2017-12-17 17:55:56 +13:00
danzel
04541150b1 Movie (recorded inputs) playback and recording. SDL has command lines to control it. 2017-12-17 16:43:09 +13:00
wwylele
eeec04fcaa ldr_ro: use ServiceFramework's session slot for client slot 2017-12-17 01:43:12 +02:00
Subv
f4b595331f GSP/GPU: Make FrameBufferInfo::active_fb use the entire u32 instead of just one bit. 
The GSP module reads the entire 32 bit word from this field to determine the framebuffer.
 2017-12-16 13:33:42 -05:00
Sebastian Valle
125f5d1e68
Merge pull request #3284 from Subv/session_data 
HLE/Services: Allow specifying a SessionData template parameter to ServiceFramework.
 2017-12-16 09:14:34 -05:00
Lioncash
d613c6f74f mic_u: Migrate to the new service framework 2017-12-15 19:22:58 -05:00
Subv
1856aa7b32 Kernel/SVC: Partially implemented svcExitProcess. 
Terminating processes with ready threads is not currently implemented and will assert. It is currently unknown how the 3DS kernel stops ready threads or threads running in another core.
 2017-12-15 15:47:33 -05:00
Sebastian Valle
4fd28e715e
Merge pull request #3252 from Subv/fs_user 
HLE/FS: Converted some functions to use IPCHelpers
 2017-12-15 15:40:36 -05:00
Sebastian Valle
4b4e1861c7
Merge pull request #3265 from Subv/getappletinfo 
HLE/APT: Implement GetAppletInfo for LLE applets.
 2017-12-15 10:29:53 -05:00
Subv
9a22e8d9ed HLE/APT: Implement GetAppletInfo for LLE applets. 
Calling this function for AppletId::Application is not yet implemented because we don't support launching applications from APT.
 2017-12-14 19:30:12 -05:00
Subv
674bd550a4 HLE/APT: Stubbed FinishPreloadingLibraryApplet. 
An applet is considered "loaded" when the parent application calls this function.
 2017-12-14 19:30:11 -05:00
Subv
b5bfaaae29 HLE/FS: Use the SessionData parameter of ServiceFramework in the File class. 2017-12-14 18:24:03 -05:00
Subv
daecd812b0 HLE/Services: Allow specifying a SessionData template parameter to ServiceFramework. 
Some services can have multiple clients at the same time, and they identify the different clients using the server session as a key.
This parameter (if present) should be a structure that contains the per-session data for each service.
The data can be retrieved using ServiceFramework::GetSessionData(session)
 2017-12-14 18:24:02 -05:00
bunnei
4b8a7eb1ca
Merge pull request #3192 from wwylele/cro-new-frame 
ldr_ro: convert to ServiceFramework
 2017-12-13 22:30:03 -05:00
bunnei
c23c39132a
Merge pull request #3239 from wwylele/cam-new-frame 
cam: convert to ServiceFramework
 2017-12-13 22:27:58 -05:00
bunnei
9b598d936d
Merge pull request #3248 from wwylele/ir-new-frame 
ir: convert to ServiceFramework
 2017-12-13 22:24:51 -05:00
Subv
2552efac01 HLE/FS: Use PopEnum in OpenFile. 2017-12-13 19:51:36 -05:00
Subv
d790ac465c HLE/FS: Use IPCHelper in CreateFile. 2017-12-13 19:51:21 -05:00
Subv
92e71aff57 HLE/FS: Use IPCHelper in DeleteDirectoryRecursively. 2017-12-12 17:48:15 -05:00
Subv
67382e46c0 HLE/FS: Use IPCHelper in DeleteDirectory. 2017-12-12 17:48:12 -05:00
Subv
b631f77d11 HLE/FS: Use IPCHelper in RenameFile. 2017-12-12 17:48:10 -05:00
Subv
a6c69bfca0 HLE/FS: Use IPCHelper in DeleteFile. 2017-12-12 17:48:07 -05:00
Subv
e9a70ce2fc HLE/FS: Use IPCHelper in OpenFileDirectly. 2017-12-12 17:48:03 -05:00
Sebastian Valle
6afd091c37
Merge pull request #3235 from Subv/dlp3 
HLE/FS: Implemented FSFile::OpenSubFile.
 2017-12-12 17:01:18 -05:00
MerryMage
fb2d34997e core/arm: Backend-specific context implementations 2017-12-12 19:12:03 +00:00
Subv
c9ddd5b0ae HLE/FS: Implemented FSFile::OpenSubFile. 
The File class now holds a list of connected sessions along with data unique to each session.

A subfile is a window into an existing file. They have a few limitations compared to normal files:

* They can't be written to.
* They can't be flushed.
* Their size can not be changed.
* New subfiles can't be created from another subfile.
 2017-12-12 13:34:02 -05:00
Sebastian Valle
b4bb74a101
Merge pull request #3268 from lioncash/ipc-enum 
ipc_helpers: Add member functions for pushing and popping strongly typed enums
 2017-12-12 12:52:02 -05:00
Merry
5c802d35ef
Merge pull request #3262 from lioncash/warn 
common/core: Silence initialization order warnings
 2017-12-11 19:52:53 +00:00
Sebastian Valle
1e3113b1b2
Merge pull request #3251 from Subv/fs_numseeds 
HLE/FS: Stubbed GetNumSeeds to always return 0 seeds.
 2017-12-11 14:13:10 -05:00
Sebastian Valle
4a3d7863fa
Merge pull request #3250 from Subv/news_notifications 
HLE/News: Stubbed GetTotalNotifications to always return 0 notifications.
 2017-12-11 14:12:22 -05:00
Lioncash
91a804707b ipc_helpers: Add member functions for pushing and popping strongly typed enums 
Alleviates the need to static_cast to an enum type at the call sites of the Push and Pop calls.

We only allow strongly typed enums, as they have a defined type of int
by default if an underlying type isn't explicitly specified, whereas
with regular enums, if an underlying type isn't specified, an
implementation-defined  type is used that can fit all the enumeration
values.
 2017-12-10 23:10:00 -05:00
Lioncash
c31f932afe common/core: Silence initialization order warnings 2017-12-10 19:50:45 -05:00
B3n30
2146311ad1
Merge pull request #3091 from Subv/hle_request_delat 
Kernel/IPC: Add a small delay after each SyncRequest to prevent thread starvation.
 2017-12-10 19:59:19 +01:00
Subv
0ac82af50f HLE/FS: Stubbed GetNumSeeds to always return 0 seeds. 
We don't yet implement the SEEDDB store.
This number is supposed to be modified by the AddSeed function (0x087A0180) but there's too little info about it on 3dbrew.
 2017-12-10 13:08:04 -05:00
Subv
98e3872353 Kernel/IPC: Use 39 microseconds for the SendSyncRequest delay approximation. 
As measured by the time it takes for to return when performing the SetLcdForceBlack IPC request to the GSP:GPU service in a n3DS with firmware 11.6

See https://gist.github.com/ds84182/ecdbbd25b56a29bd4e5b32a7544b8e92 for the source code of the test.
 2017-12-10 13:00:05 -05:00
Sebastian Valle
c72262d7e3
Merge pull request #3246 from Steveice10/pxidev 
HLE: Add pxi:dev stub.
 2017-12-10 12:21:35 -05:00
Sebastian Valle
2859b98884
Merge pull request #3234 from Subv/dlp2 
HLE/FS: Implemented FS::GetProgramLaunchInfo.
 2017-12-10 08:58:08 -05:00
Sebastian Valle
951b023a3d
Merge pull request #3259 from lioncash/init-order 
ac: Correct constructor initialization order
 2017-12-10 08:46:11 -05:00
Yuri Kunde Schlesner
312281fd61
Merge pull request #3256 from yuriks/move-svc 
HLE: Move svc.cpp to kernel/
 2017-12-10 01:13:46 -05:00
Lioncash
bca58546b1 ac: Correct constructor initialization order 
The parent class constructor will always run before the
class' initializers for member variables.
 2017-12-09 23:48:40 -05:00
Yuri Kunde Schlesner
21188f5683 HLE: Move SVC handlers to the Kernel namespace 2017-12-09 20:32:58 -08:00
Yuri Kunde Schlesner
ad71e23f23 HLE: Move svc.{cpp,h} to kernel/ 2017-12-09 18:10:47 -08:00
Subv
7d038b9bd8 HLE/FS: Implemented FS::GetProgramLaunchInfo. 
This function is used by the DLP system module during the DLPSRVR initialization.
 2017-12-09 18:46:34 -05:00
Dragios
8b864a74e9 Add new AppID (eShop) 2017-12-10 07:38:56 +08:00
Dragios
ebb731b9a1 Fill up the rest of Applet IDs 2017-12-10 07:38:23 +08:00
Steveice10
16b26e73c9 HLE: Add pxi:dev stub. 2017-12-09 14:45:56 -08:00
Subv
dd0bd5520d HLE/News: Stubbed GetTotalNotifications to always return 0 notifications. 
This prevents an invalid read loop on games that call it.
 2017-12-09 11:28:57 -05:00
wwylele
35b1306941 ir_user: convert to ServiceFramework 2017-12-09 18:14:51 +02:00
wwylele
4812e98e05 ir_rst: convert to ServiceFramework 
also fix the wrong header in Shutdown
 2017-12-09 18:14:51 +02:00
wwylele
f3e41fe941 ir_u: convert to ServiceFramework 2017-12-09 12:34:23 +02:00
wwylele
5026480b36 svc: correct GetProcessInfo(20) 2017-12-08 21:28:48 +02:00
Sebastian Valle
69caf8c5dc
Merge pull request #3236 from Tilka/block_name 
cfg: refer to ConsoleModelBlockID by name
 2017-12-08 09:01:22 -05:00
wwylele
07acc6ceab cam: convert to ServiceFramework 2017-12-08 11:20:48 +02:00
Tillmann Karras
6752576de9 cfg: refer to ConsoleModelBlockID by name 2017-12-08 06:56:00 +00:00
Subv
e90daa6a4f Kernel/IPC: Add a small delay after each SyncRequest to prevent thread starvation. 
In a real 3DS, threads that call svcSyncRequest are put to sleep until the server responds via svcReplyAndReceive. Our HLE services don't implement this mechanism and are effectively immediate from the 3DS's point of view. This commit makes it so that we at least simulate the IPC delay.

Specific HLE handlers might need to put their callers to sleep for a longer period of time to simulate IO timings. This is their responsibility but doing so is currently not implemented.

See https://gist.github.com/ds84182/4a7690c5376e045cab9129ca4185bbeb for a test that was not passing before this commit.
 2017-12-07 22:40:15 -05:00
Lioncash
ff96c5dba0 svc: Provide names for svc 0x59 and 0x5A 
Updated according to 3dbrew.
 2017-12-07 22:14:55 -05:00
wwylele
2b907dadf4 cro_helper: add todo about process handle 2017-12-07 16:20:15 +02:00
wwylele
9749a43cc4 ldr_ro: create per-client storage; pass process where needed 2017-12-07 16:01:01 +02:00
wwylele
de8dbbf0b6 ldr_ro: convert to ServiceFramework 2017-12-07 15:59:54 +02:00
MerryMage
a9af4be363 ldr_ro: Use ranged instruction cache invalidation 2017-12-06 20:59:09 +00:00
Sebastian Valle
4b1253b51a
Merge pull request #3226 from Subv/arbiter_timeout 
HLE/AddressArbiter: Remove threads that were awoken by timeout from an Arbiter's waitlist
 2017-12-06 12:11:23 -05:00
Subv
8c16b90eae HLE/AddressArbiter: Remove threads that were awoken by timeout from the arbiter's waitlist when using WaitIfLessThanWithTimeout and DecrementAndWaitIfLessThanWithTimeout. 
Fixes a regression introduced in #3096
 2017-12-06 09:06:45 -05:00
B3n30
b9db9af9e8 fixup! Applet: Print unknown AppletId on ASSERT 2017-12-06 13:52:21 +01:00
B3n30
ddc59e3881 Applet: Print unknown AppletId on ASSERT 2017-12-06 12:41:46 +01:00
CDAGaming
2052a201c0 Fix Clang Format Error 2017-12-05 14:21:59 -05:00
Subv
3d000c834b Kernel/Threads: Implement an SleepClientThread function for HLERequestContext-based services to make performing async tasks on the host while in an HLE service function easier. 
An HLE service function that wants to perform an async operation should put the caller guest thread to sleep using SleepClientThread, passing in a callback to execute when the thread is resumed.
SleepClientThread returns a Kernel::Event that should be signaled to resume the guest thread when the host async operation completes.
 2017-12-05 14:21:59 -05:00
wwylele
6050d000fa fs: correct header code; remove dead code 2017-12-05 16:34:01 +02:00
Yuri Kunde Schlesner
9f806384f5
Merge pull request #3190 from Subv/errf_srv_framework 
HLE/Services: Convert err:f to the new ServiceFramework.
 2017-12-05 00:49:44 -05:00
bunnei
56db8e0858
Merge pull request #3173 from shinyquagsire23/nfc-o3ds-stub 
Services/NFC: Stub StartTagScanning as it should be for o3DS
 2017-12-04 16:11:54 -05:00
Subv
30bffb1964 HLE/Services: Convert err:f to the new ServiceFramework. 2017-12-04 14:03:11 -05:00
B3n30
3249187ad6
Merge pull request #3181 from wwylele/ipc-handle-split 
ipc_helper: split PushMoveObjects and PushCopyObjects
 2017-12-04 18:49:42 +01:00
wwylele
fda023c9fa ipc_helper: split PushMoveObjects and PushCopyObjects 2017-12-04 19:46:44 +02:00
wwylele
ff00cb391a service/ptm: add missing % in logging 2017-12-03 11:52:42 +02:00
Weiyi Wang
2664042325
Merge pull request #3086 from Subv/swkbd_launch 
HLE/APT: Allow launching native applets instead of HLE ones.
 2017-12-03 11:38:29 +02:00
Weiyi Wang
14819d0b84
Merge pull request #3138 from wwylele/ipc-mapped-buffer 
Kernel/IPC: Implement MappedBuffer translation for HLE services that use the HLERequestContext architecture.
 2017-12-03 11:33:48 +02:00
wwylele
a79a8d17fa FS: transform File to ServiceFramework 2017-12-03 00:05:20 +02:00
wwylele
cef6b15de4 IPC Helpers: Implement MappedBuffer translation helper for new interface 2017-12-03 00:05:20 +02:00
wwylele
3ecf650bf9 Kernel/IPC: Implement MappedBuffer translation for HLE services that use the HLERequestContext architecture. 2017-12-03 00:05:20 +02:00
shinyquagsire23
5ad4cf619e Services/NFC: Stub StartTagScanning as it should be for o3DS 2017-12-01 12:42:23 -07:00
Lioncash
89f67ad90f services: Silence warnings related to logging 2017-11-29 18:59:54 -05:00
bunnei
b2a99043e3
Merge pull request #2968 from Subv/hle_thread_pause 
Kernel/Threads: Add a new thread status that will allow using a Kernel::Event to put a guest thread to sleep inside an HLE handler until said event is signaled
 2017-11-29 10:45:48 -05:00
Subv
1be31e271a NS/Applets: Added the MiiSelector applet to the list of native applet ids. 2017-11-28 09:12:52 -05:00
Subv
9543e1a1bf HLE/IPC: Don't assert in HLERequestContext::AddStaticBuffer when there's already a static buffer with the desired id. 
This could happen if the guest application performs a request with static buffer id X, and the service module responds with another static buffer with the same id X.
 2017-11-28 09:01:15 -05:00
B3n30
e9a95b2e7d
CoreTiming: Reworked CoreTiming (#3119) 
* CoreTiming: New CoreTiming; Add Test for CoreTiming
 2017-11-25 14:56:57 +01:00
James Rowe
b7cf793814
Merge pull request #3113 from shinyquagsire23/sdl-cia-install 
SDL CIA Installation
 2017-11-24 10:23:20 -07:00
shinyquagsire23
70ff3c72f1 Services/AM: Detect encrypted CIAs 2017-11-20 20:45:21 -07:00
shinyquagsire23
253954930f Services/AM: Return InstallStatus for InstallCIA 2017-11-19 21:56:02 -07:00
Sebastian Valle
555c8ba7c1
Merge pull request #3077 from Subv/hle_static_buffer 
Kernel/IPC: Implement StaticBuffer translation for HLE services that use the HLERequestContext architecture.
 2017-11-19 11:34:02 -05:00
Sebastian Valle
ff275ac1e1
Merge pull request #3083 from Subv/lle_staticbuffer_translation 
Kernel/IPC: Handle the StaticBuffer descriptor in LLE command requests.
 2017-11-19 11:31:49 -05:00
shinyquagsire23
56e906f1e3 Services/AM: Add InstallCIA function for frontends 2017-11-15 16:05:37 -07:00
shinyquagsire23
1f2aa29dee Services/AM: Move CIA finalization into Close(), Close() on destruction of class 2017-11-15 16:05:33 -07:00
shinyquagsire23
750e7e06b1 Services/AM: Expose CIAFile class in AM header 2017-11-15 12:05:03 -07:00
Sebastian Valle
947067de81
Merge pull request #3085 from Subv/get_service_handle 
HLE/SRV: Don't return the port handle if it isn't available when calling GetServiceHandle.
 2017-11-15 13:46:12 -05:00
shinyquagsire23
1edbbf7f8c Services/AM: Add GetTitleMediaType 2017-11-15 11:26:00 -07:00
James Rowe
5eabe60aa3
Merge pull request #2969 from mailwl/ptm_step 
Service/PTM: Stub GetStepHistory function
 2017-11-15 09:39:17 -07:00
Subv
afb6dd7747 HLE/SRV: Don't return the port handle if it isn't available when calling GetServiceHandle. 
This was incorrect behavior that somehow found its way to 3dbrew. The correct behavior is to sleep until the port becomes available again and then return a session to it.

This is currently unimplemented due to the inability to put a guest thread to sleep during HLE requests.

The correct behavior was reverse engineered by TuxSH a while ago but we never corrected the code in citra.
 2017-11-15 11:26:49 -05:00
Sebastian Valle
f0027e9996
Merge pull request #3096 from Subv/arbitrateaddress 
Kernel/Arbiters: When doing ArbitrateAddress(Signal), always pick the highest priority thread, using the first one that was put to sleep if more than one thread with the same highest priority exists.
 2017-11-15 09:16:16 -05:00
Sebastian Valle
93742ec510
Merge pull request #3088 from Subv/clientsession_closing 
Kernel/Sessions: Wake up any threads waiting on a ServerSession when its client is closed
 2017-11-15 09:15:34 -05:00
Max Thomas
689fe57430 Services/AM: Fix content writing on Windows (#3114) 2017-11-15 10:26:16 +01:00
Subv
c9c1ba0952 Kernel/IPC: Implement StaticBuffer translation for HLE services that use the HLERequestContext architecture. 
The real kernel requires services to set up their static buffer targets ahead of time. This implementation does not require that and will simply create the storage for the buffers as they are processed in the incoming IPC request.

Static buffers are kept in an unordered_map keyed by their buffer id, and are written into the already-setup area of the request thread when responding an IPC request.

This fixes a regression (crash) introduced in #2992.

This PR introduces more warnings due to the [[deprecated]] attribute being added to void PushStaticBuffer(VAddr buffer_vaddr, size_t size, u8 buffer_id); and VAddr PopStaticBuffer(size_t* data_size);
 2017-11-12 11:00:00 -05:00
Subv
c68adb787b Kernel/Arbiters: When doing ArbitrateAddress(Signal), always pick the highest priority thread, using the first one that was put to sleep if more than one thread with the same highest priority exists. 
This is consistent with hardware behavior as shown by this test https://gist.github.com/ds84182/40e46129bd38b46a5100f15f96ba5eaf
 2017-11-08 18:47:08 -05:00
Sebastian Valle
908dbf4230
Merge pull request #3084 from Subv/thread_default_cpu 
Kernel/Thread: Use the process' ideal CPU when specifying the Default CPU on CreateThread.
 2017-11-08 14:38:50 -05:00
Sebastian Valle
7d12aaaa20
Merge pull request #3087 from shinyquagsire23/am-more-errors 
Services/AM: Add errors and adjust naming for accuracy
 2017-11-07 09:09:48 -05:00
shinyquagsire23
c07f1b275c Services/AM: Rename and readjust GetNumContentInfos for accuracy 2017-11-06 21:36:49 -07:00
shinyquagsire23
d854d4119a Services/AM: Rename and adjust ListContentInfos for accuracy 2017-11-06 21:35:00 -07:00
shinyquagsire23
c6e43ae79d Services/AM: Rename and adjust FindContentInfos for accuracy 2017-11-06 21:35:00 -07:00
shinyquagsire23
69cc04a06d Services/AM: Fix warnings 2017-11-06 21:34:54 -07:00
Subv
06a2e0b591 Kernel/Sessions: Wake up any threads waiting on a ServerSession when its client is closed 
The error code 0xC920181A will be returned by svcReplyAndReceive when the wakeup callback runs.
This lets LLE services be properly notified of clients closing the connection so they can end their handler threads instead of letting them linger indefinitely, taking up connection slots in their parent port.
 2017-11-06 23:07:08 -05:00
Subv
d1de6b8864 HLE/APT: Try to launch a native applet in PrepareToStartLibraryApplet and PreloadLibraryApplet before falling back to HLE applets. 
With this commit, you can run native applets if they are in the correct folder of your virtual NAND.

Trying to exit the applet will currently cause an invalid read loop due to svcExitProcess not being implemented.
 2017-11-06 16:42:26 -05:00
Subv
ecb1c6d2a1 HLE/APT: Added a function to retrieve the titleid of an applet based on the current system region. 
The table was taken from the real APT service, but is incomplete due to the sheer amount of data it contains. There's 29 applets with 7 possible titleids. This table should be filled as needed.
 2017-11-06 16:42:26 -05:00
Subv
191565a1b8 HLE/NS: Added a function to launch titles installed to the virtual NAND/SD card. 
It uses AM::GetTitleContentPath to retrieve the path of the program to launch.
 2017-11-06 15:12:15 -05:00
Sebastian Valle
c6b2cc2e27
Merge pull request #3082 from Subv/main_thread_processor 
Kernel/Thread: Run the main thread in the CPU specified by the process' exheader.
 2017-11-06 14:00:24 -05:00
Subv
a288c2e737 Kernel/Thread: Use the process' ideal CPU when specifying the Default CPU on CreateThread. 
This behavior was reverse engineered from the real kernel.
 2017-11-06 13:47:48 -05:00
Subv
2d9e295e07 Kernel/IPC: Handle the StaticBuffer descriptor in LLE command requests. 
This descriptor requires the target process to set up a "receive buffer" beforehand, where the input data will be written to when the descriptor is processed.
 2017-11-06 13:30:31 -05:00
bunnei
6e12b11353
Merge pull request #3078 from Subv/ac_sessions 
Services/AC: Corrected the number of concurrent connections for AC_I and AC_U
 2017-11-06 13:21:29 -05:00
Subv
980df62397 Kernel/Thread: Run the main thread in the CPU specified by the process' exheader. 
System services usually have Core1 in this field, but citra was running them in Core0 regardless.
 2017-11-06 13:14:31 -05:00
Sebastian Valle
d55a13c35d
Merge pull request #2981 from Subv/replyreceive 
Kernel/SVC: Implement LLE command buffer translation in ReplyAndReceive
 2017-11-06 13:02:30 -05:00
Subv
23deae4785 Debugging: Implement GetName for Kernel::ServerSession. 
Fixes the "[UNKNOWN KERNEL OBJECT]" message in the wait tree when inspecting a server session.
 2017-11-06 10:47:06 -05:00
Subv
5f92dc963c Kernel/SVC: Implement LLE command buffer translation in ReplyAndReceive. 
The real kernel's ReplyAndReceive will retry the call until one of the objects can be acquired without causing a translation error, this is not currently implemented and the code will instead assert that the translation was a success.
 2017-11-06 10:47:04 -05:00
Subv
8f108367c9 Kernel/IPC: Put a thread to sleep when performing an LLE IPC request. 
It will be awoken when the server replies to the request via svcReplyAndReceive.
 2017-11-06 10:46:19 -05:00
Subv
33c5982f6d Kernel/Threads: Added a new thread status to identify threads waiting for an IPC reply from svcSendSyncRequest. 2017-11-06 10:46:19 -05:00
Subv
8e2d9f48f5 Kernel/IPC: Remove dead buffer translation code. 
This is all implemented elsewhere, HLERequestContext for HLE requests, and svcReplyAndReceive for LLE requests.
 2017-11-06 10:46:18 -05:00
Subv
7cf7999e02 Kernel/IPC: Added a function to translate the IPC command buffer from one process to another. 
Currently only CopyHandle, MoveHandle and CallingPid descriptors are implemented.
 2017-11-06 10:46:12 -05:00
wwylele
4fdc877626 remove trailing spaces 2017-11-06 13:57:06 +02:00
Sebastian Valle
ff17773c28
Kernel/Mutex: Add a missing return in Mutex::Release 
Fixes a regression in #3042.
Closes #3079
 2017-11-05 21:31:22 -05:00
Sebastian Valle
8ba2de1580
Merge pull request #3029 from shinyquagsire23/am-title-install 
Services/AM: Add CIA title installation support.
 2017-11-05 21:23:55 -05:00
shinyquagsire23
e00a45c500 Services/AM: Add CIA title installation support. 2017-11-05 13:26:29 -07:00
shinyquagsire23
7ea04bb55c Services/AM: Fix log commands 2017-11-05 13:26:29 -07:00
shinyquagsire23
ce806dcdf6 file_sys/title_metadata: Allow loading from both files, FileBackends, and data 2017-11-05 13:26:29 -07:00
Subv
d4077b0196 Services/AC: Corrected the number of concurrent connections for AC_I and AC_U 
The number was reverse engineered from the AC module.
 2017-11-05 14:28:06 -05:00
Weiyi Wang
4fc0448093
Merge pull request #3064 from wwylele/printf-warnings 
Clean all format warnings
 2017-11-05 10:32:46 +02:00
Sebastian Valle
9a52d72362
Merge pull request #3042 from Subv/releasemutex 
Kernel/SVC: Don't let svcReleaseMutex release a mutex owned by another thread
 2017-11-04 12:57:44 -05:00
bunnei
5885ca4503
Merge pull request #3067 from Hexagon12/wsacleanup-soc-fix 
Removed duplicate calls of WSACleanup in soc_u.
 2017-11-04 13:39:09 -04:00
James Rowe
c14f802381
Merge pull request #2992 from Subv/ac_srvframework 
Services/AC: Converted the ac:i and ac:u services to the new service framework.
 2017-11-04 10:42:09 -06:00
Sebastian Valle
3fe9b332bc
Merge pull request #2989 from B3n30/sendTo_PullPacket_Bind 
Service/UDS: Implement Bind, Unbind, SendTo, PullPacket, and GetNodeInformation
 2017-11-04 10:58:49 -05:00
Hexagon12
695ff7cff3
Clang pls (again) 2017-11-04 17:41:20 +02:00
Hexagon12
81e36150d3
Clang pls 2017-11-04 17:32:12 +02:00
Subv
68dba11805 Kernel/SVC: Don't let svcReleaseMutex release a mutex owned by another thread. 
This behavior was reverse engineered from the 3DS kernel.
 2017-11-04 10:05:18 -05:00
B3n30
ed9db735a2 Service/UDS: Updated BeginHostingNetwork 2017-11-04 15:41:54 +01:00
B3n30
f6d16c3f87 Service/UDS: Implement Unbind and GetNodeInformation 2017-11-04 15:41:54 +01:00
B3n30
230ea063a5 Service/UDS: Implement SendTo, PullPacket, HandleSecureData, and Bind 2017-11-04 15:41:27 +01:00
Hexagon12
4ded138139
Update soc_u.cpp 2017-11-04 16:30:48 +02:00
Hexagon12
5d123144ff
Removed all instances of WSACleanup();. 2017-11-04 15:03:04 +02:00
wwylele
499508389c core: clear format warnings 2017-11-01 12:35:32 +02:00
Subv
95df4e674a Services/AC: Converted the ac:i and ac:u services to the new service framework. 2017-10-27 19:39:19 -05:00
shinyquagsire23
2e38ea7a33 Services/AM: Implement GetPatchTitleInfos, correct error codes/returns, misc fixes 2017-10-26 21:06:29 -06:00
Sebastian Valle
aee8bf680c Merge pull request #3032 from Dragios/errno 
Remove some errno constants as it was already defined
 2017-10-23 10:30:18 -05:00
Dragios
eb671d8513 Remove some errno constants as it was already defined 2017-10-22 14:22:27 +08:00
Dragios
e46f66a5fa Remove Crypto++ weak algorithm warning 2017-10-22 13:56:59 +08:00
MerryMage
f5be3258f2 hle/lock: Remove #pragma once in cpp file 2017-10-21 13:59:14 +01:00
James Rowe
dcb48840c3 Merge pull request #2993 from shinyquagsire23/am-and-archive-ncch-rework 
AM Service and NCCH Archive Rework
 2017-10-20 22:59:38 -06:00
shinyquagsire23
1ac5137655 file_sys/archive_ncch: Use AM to get title content path, add ExeFS support and support for additional content indexes 2017-10-18 21:19:40 -06:00
shinyquagsire23
b9fc359e7e Services/AM: Add title scanning, move to ipc_helper.h, implement most stubbed service calls 2017-10-18 21:19:34 -06:00
Dragios
83e5f639e6 Change command header in nwm::UDS Initialize function 2017-10-09 09:10:48 +08:00
Sebastian Valle
20e19a340c Merge pull request #2991 from Subv/getpointer 
Remove more usages of GetPointer.
 2017-10-08 10:11:12 -05:00
Sebastian Valle
84c344b9b1 Merge pull request #2953 from Subv/applet_launch 
HLE/APT: Always set up the APT parameter when starting a library applet.
 2017-10-04 15:01:58 -05:00
Subv
97f262c1f5 SVC: Removed GetPointer usage in the GetResourceLimit functions. 2017-10-04 14:04:27 -05:00
Subv
46fc7595b4 SVC: Remove GetPointer usage in CreatePort. 2017-10-04 14:04:03 -05:00
Subv
7b09b30ef1 SVC: Replace GetPointer usage with ReadCString in ConnectToPort. 2017-10-04 14:03:59 -05:00
Subv
3c0113632d SVC: Replace GetPointer usage with ReadBlock in OutputDebugString. 2017-10-04 12:30:33 -05:00
Subv
0cfb231e00 SVC: Replace GetPointer usage with Read32 in ReplyAndReceive. 2017-10-04 12:30:33 -05:00
Subv
b863d6c860 SVC: Replace GetPointer usage with Read32 in WaitSynchronizationN. 2017-10-04 12:30:32 -05:00
bunnei
15c7641bef Merge pull request #2977 from Subv/shmem_create 
SharedMemory: Don't take over and unmap the source memory block when creating a shared memory, just reference it
 2017-10-03 16:21:49 -04:00
Subv
b18589ecf7 Kernel/SharedMemory: Don't take over and unmap the source memory block when creating a shared memory, just reference it. 
Also reference the right offset into the backing block for the requested address.
 2017-10-02 15:16:16 -05:00
Sebastian Valle
30fabc41c6 Merge pull request #2971 from Subv/per_process_memops 
Memory: Add overloads for ReadBlock and WriteBlock that operate on a specific process.
 2017-10-01 14:44:06 -05:00
Subv
8217ed7acb Kernel/Thread: Added a helper function to get a thread's command buffer VAddr. 2017-10-01 14:18:35 -05:00
Sebastian Valle
9c123c29a6 Merge pull request #2974 from Subv/nim_event 
Services/NIM: Implement CheckForSysUpdateEvent.
 2017-10-01 14:16:14 -05:00
Subv
5bae5a48b9 Services/NIM: Implement CheckForSysUpdateEvent. 
Implementation verified by reverse engineering.
This lets the Home Menu boot without crashing on startup.
 2017-09-30 13:21:45 -05:00
Huw Pascoe
529f4a0131 Moved down_count to CoreTiming 2017-09-30 17:38:14 +01:00
B3n30
afb1012bcd Services/UDS: Handle the rest of the connection sequence. (#2963) 
Services/UDS: Handle the rest of the connection sequence.
 2017-09-30 18:18:45 +02:00
Subv
f9d55ecf3f HLE: Implemented SleepClientThread and ContinueClientThread functions to make performing async tasks on the host while in an HLE service function easier. 
An HLE service function that wants to perform an async operation should put the caller guest thread to sleep using SleepClientThread, passing in a callback to execute when the thread is resumed.
SleepClientThread returns a ThreadContinuationToken that should be stored and used with ContinueClientThread to resume the guest thread when the host async operation completes.
 2017-09-30 11:16:55 -05:00
Subv
0a308e224c Kernel/Threads: Add a new thread status that will allow using a Kernel::Event to put a guest thread to sleep inside an HLE handler until said event is signaled. 2017-09-30 11:16:49 -05:00
Sebastian Valle
7056b9c46a Merge pull request #2946 from Subv/home_menu_apt 
Implement PrepareToStartNewestHomeMenu and fixed an APT regression.
 2017-09-30 10:47:42 -05:00
Sebastian Valle
db752b52e8 Merge pull request #2967 from Subv/thread_wakeup_callbacks 
Kernel/Threads: When putting a thread to wait, specify a function to execute when it is awoken
 2017-09-30 09:12:18 -05:00
Huw Pascoe
a13ab958cb Fixed type conversion ambiguity 2017-09-30 09:34:35 +01:00
mailwl
8883dca514 Service/PTM: Stub GetStepHistory function 2017-09-29 15:34:41 +03:00
Subv
8432749db7 Kernel/Threads: When putting a thread to wait, specify a function to execute when it is awoken. 
This change makes for a clearer (less confusing) path of execution in the scheduler, now the code to execute when a thread awakes is closer to the code that puts the thread to sleep (WaitSynch1, WaitSynchN). It also allows us to implement the special wake up behavior of ReplyAndReceive without hacking up WaitObject::WakeupAllWaitingThreads.

If savestates are desired in the future, we can change this implementation to one similar to the CoreTiming event system, where we first register the callback functions at startup and assign their identifiers to the Thread callback variable instead of directly assigning a lambda to the wake up callback variable.
 2017-09-28 11:53:32 -05:00
Subv
3165466b66 Kernel/Thread: Allow specifying which process a thread belongs to when creating it. 
Don't automatically assume that Thread::Create will only be called when the parent process is currently scheduled. This assumption will be broken when applets or system modules are loaded.
 2017-09-26 17:40:49 -05:00
Subv
e27ae04696 HLE/APT: Always set up the APT parameter when starting a library applet. 
Only use the HLE interface if an HLE applet with the desired id was started.

This commit reorganizes the APT code surrounding parameter creation and delivery to make it easier to support LLE applets in the future.

As future work, the HLE applet interface can be reworked to utilize the same facilities as the LLE interface.
 2017-09-25 23:47:50 -05:00
Subv
774e7deae8 HLE/Archives: Allow multiple loaded applications to access their SelfNCCH archive independently. 
The loaders now register each loaded ROM with the SelfNCCH factory, which keeps the data around for the duration of the emulation session.

When opening the SelfNCCH archive, the factory queries the current program's programid and uses that as a key to the map that contains the NCCHData structure (RomFS, Icon, Banner, etc).

3dsx files do not have a programid and will use a default of 0 for this value, thus, only 1 3dsx file with RomFS is loadable at the same time.
 2017-09-25 09:45:02 -05:00
B3n30
d881dee818 Merge pull request #2952 from MerryMage/page-tables 
Switchable Page Tables
 2017-09-25 08:29:32 +02:00
B3n30
a21b9deb98 Merge pull request #2948 from Subv/register_service 
HLE/SRV: Implemented RegisterService.
 2017-09-25 08:22:05 +02:00
B3n30
d673d508dd Services/UDS: Added a function to send EAPoL-Start packets (#2920) 
* Services/UDS: Added a function to generate the EAPoL-Start packet body.

* Services/UDS: Added filter for beacons.

* Services/UDS: Lock a mutex when accessing connection_status from both the emulation and network thread.

* Services/UDS: Handle the Association Response frame and respond with the EAPoL-Start frame.

* fixup: make use of current_node, changed received_beacons into a list, mutex and assert corrections

* fixup: fix damn clang-format
 2017-09-25 08:16:27 +02:00
MerryMage
c02bbb7030 memory: Add GetCurrentPageTable/SetCurrentPageTable 
Don't expose Memory::current_page_table as a global.
 2017-09-24 22:42:42 +01:00
Subv
7096f01c14 HLE/APT: Always return an error from PrepareToStartNewestHomeMenu so that the Home Menu doesn't try to reboot the system. 
As per 3dbrew:
"During Home Menu start-up it uses APT:PrepareToStartNewestHomeMenu. If that doesn't return an error(normally NS returns 0xC8A0CFFC for that), Home Menu starts a hardware reboot with APT:StartNewestHomeMenu etc. "
 2017-09-24 08:59:31 -05:00
Subv
b57d58c0dc HLE/APT: Prepare the APT Wakeup parameter when the game calls Initialize 
We need to know what is being run so we can set the APT parameter destination AppId correctly.
Delaying the preparation of the parameter until we know which AppId is running lets us support booting both the Home Menu and normal game Applications.
 2017-09-24 08:59:30 -05:00
Subv
0b33e36292 HLE/SRV: Implemented RegisterService. 
Now system modules can do more than just crash immediately on startup.
 2017-09-24 00:12:58 -05:00
Yuri Kunde Schlesner
255fd8768d Merge pull request #2906 from Subv/ns_new_framework 
Services/NS: Port ns:s to the new service framework.
 2017-09-16 21:13:51 +02:00
Subv
3d86e3afc4 Services/NS: Port ns:s to the new service framework. 2017-09-16 10:52:45 -05:00
B3n30
813837c5cf Merge pull request #2842 from Subv/switchable_page_table 
Kernel/Memory: Give each process its own page table and allow switching the current page table upon reschedule
 2017-09-15 22:41:45 +02:00
Subv
b178089251 Kernel/Threads: Don't clear the CPU instruction cache when performing a context switch from an idle thread into a thread in the same process. 
We were unnecessarily clearing the cache when going from Process A -> Idle -> Process A, this caused extreme performance regressions.
 2017-09-15 14:26:15 -05:00
Subv
214150f00c Kernel/Memory: Changed GetPhysicalPointer so that it doesn't go through the current process' page table to obtain a pointer. 2017-09-15 14:26:13 -05:00
bunnei
588077184b Merge pull request #2915 from wwylele/font-archive-2 
APT: load different shared font depending on the region
 2017-09-11 21:39:56 -04:00
Subv
c34ec5e77c Kernel/Memory: Switch the current page table when a new process is scheduled. 2017-09-10 15:14:31 -05:00
Subv
6d2734a074 Kernel/Memory: Give each Process its own page table. 
The loader is in charge of setting the newly created process's page table as the main one during the loading process.
 2017-09-10 15:13:41 -05:00
Weiyi Wang
617b6974b9 Merge pull request #2831 from Subv/uds_auth 
Services/UDS: Handle beacon frames and the basic AP connection sequence frames.
 2017-09-05 15:03:56 +03:00
mailwl
11f2eff17d Remove _flag in var names 2017-09-04 12:15:15 +03:00
mailwl
589babbf74 Mii Selector Applet: update Mii structures 2017-09-04 12:04:12 +03:00
wwylele
59a9aaf388 APT: load different shared font depending on the region 2017-09-03 12:34:11 +03:00
bunnei
75cd28a7cc Merge pull request #2899 from wwylele/touch-refactor 
Refactor touch input into a TouchDevice
 2017-08-29 11:29:10 -04:00
danzel
8266064796 Use recursive_mutex instead of mutex to fix #2902 2017-08-29 20:39:55 +12:00
Subv
f64cd87604 Services/UDS: Remove an old duplicated declaration of WifiPacket. 2017-08-27 10:48:15 -05:00
Subv
d088dbfbe1 Services/UDS: Handle the connection sequence packets. 
There is currently no stage tracking, a client is considered "Connected" when it receives the EAPoL Logoff packet from the server, this is not yet implemented.
 2017-08-27 10:48:13 -05:00
Subv
2e9f544ecc Services/UDS: Store the received beacon frames until RecvBeaconBroadcastData is called, up to 15 beacons at the same time, removing any older beacon frames when the limit is exceeded. 2017-08-27 10:48:11 -05:00
Subv
54411bef4e Services/UDS: Add functions to generate 802.11 auth and assoc response frames. 2017-08-27 10:48:09 -05:00
wwylele
c84e60b470 HID: use TouchDevice for touch pad 2017-08-24 13:56:43 +03:00
James Rowe
61442d6afb Merge pull request #2839 from Subv/global_kernel_lock 
Kernel/HLE: Use a mutex  to synchronize access to the HLE kernel state between the cpu thread and any other possible threads that might touch the kernel (network thread, etc).
 2017-08-23 18:17:44 -06:00
bunnei
2bbff9fa96 Merge pull request #2893 from Subv/not_schedule_main_thread 
Kernel/Threads: Don't immediately switch to the new main thread when loading a new process.
 2017-08-22 17:45:47 -04:00
Subv
bca8916cea Kernel/HLE: Use a mutex to synchronize access to the HLE kernel state between the cpu thread and any other possible threads that might touch the kernel (network thread, etc). 
This mutex is acquired in SVC::CallSVC, ie, as soon as the guest application enters the HLE kernel, and should be acquired by the aforementioned threads before modifying kernel structures.
 2017-08-22 09:30:55 -05:00
Subv
fa228ca637 Kernel/Threads: Don't immediately switch to the new main thread when loading a new process. 
This is necessary for loading multiple processes at the same time.
The main thread will be automatically scheduled when necessary once the scheduler runs.
 2017-08-21 20:54:29 -05:00
Subv
65f19b51c4 Warnings: Add UNREACHABLE macros to switches that contemplate all possible values. 2017-08-21 08:34:28 -05:00
Subv
145a7293a3 HLE/Applets: Fixed some conversion warnings when creating the framebuffer shared memory objects. 2017-08-21 08:34:27 -05:00
James Rowe
bbfa9d0635 Merge pull request #2861 from wwylele/motion-refactor 
Refactor MotionEmu into a InputDevice
 2017-08-19 23:43:01 -06:00
wwylele
54c0c8adee HID: fix a comment and a warning 2017-08-20 08:37:48 +03:00
Yuri Kunde Schlesner
21204ba488 Merge pull request #2881 from MerryMage/dsp-firm-check 
dsp_dsp: Remove size assertion in LoadComponent
 2017-08-15 20:14:41 -07:00
MerryMage
b67c2dc82c dsp_dsp: Remove size assertion in LoadComponent 2017-08-15 10:16:50 +01:00
Sebastian Valle
d59f503729 Merge pull request #2843 from Subv/applet_slots 
Services/APT: Use an array to hold data about the 4 possible concurrent applet types (Application, Library, HomeMenu, System)
 2017-08-12 10:27:57 -05:00
wwylele
867eabd6b7 HID: use MotionDevice for Accelerometer and Gyroscope 2017-08-11 11:03:18 +03:00
Weiyi Wang
aaf5161344 Merge pull request #2863 from wwylele/pad-state-zero 
HID: zero unused PadState bits
 2017-08-10 17:50:18 +03:00
wwylele
599de29ea3 HID: zero unused PadState bits 2017-08-10 17:01:03 +03:00
bunnei
c2466a2f19 Merge pull request #2862 from j-selby/update-cryptopp 
Update CryptoPP (byte ambiguity)
 2017-08-09 16:18:43 -04:00
mailwl
a6273dd56a Service/dlp: Update function tables according 3dbrew 2017-08-09 16:14:07 +03:00
James
1a44949ef7 Update cryptopp 2017-08-08 17:50:09 +10:00
Subv
177e8ce655 Services/APT: Use the AppletAttributes union directly when dealing with applet attrs. 2017-08-07 16:09:55 -05:00
Subv
73fba0de46 Services/APT: Use an array to hold data about the 4 possible concurrent applet types (Application, Library, HomeMenu, System). 
This gives each applet type its own set of events as per the real NS module.
 2017-08-07 14:53:58 -05:00
bunnei
5c631ec9c5 telemetry: Add field for RequiresSharedFont. 2017-08-03 20:10:37 -04:00
bunnei
f15e5522dc Merge pull request #2840 from Subv/apt_parameter 
Services/APT: Corrected the behavior of the Receive/Send/Glance/CancelParameter functions
 2017-07-27 11:14:27 -04:00
Weiyi Wang
045d0b5bbd Merge pull request #2799 from yuriks/virtual-cached-range-flush 
Add address conversion functions returning optional, Add function to flush virtual region from rasterizer cache
 2017-07-22 10:15:52 +03:00
Subv
e59ab7c1d6 Service/APT: Log Send/Cancel/Receive/GlanceParameter calls even if they return an error. 2017-07-21 15:03:06 -05:00
Subv
68596a7068 Services/APT: Return the proper error code when calling SendParameter with an outstanding parameter already in memory. 2017-07-21 14:59:26 -05:00