artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
18115 commits 1 branch 0 tags 106 MiB
Commit graph

7848 commits

Author SHA1 Message Date
bunnei 44c763f9c6 hle: kernel: KSession: Improve implementation of CloneCurrentObject. 2021-05-10 20:33:53 -07:00
bunnei cfed6936f3 hle: service: sm: Increase point buffer size. 2021-05-10 15:43:42 -07:00
bunnei 9f44a44f2f hle: ipc_helpers: Reserve session resource when we create a KSession. 2021-05-10 15:42:46 -07:00
bunnei 75f23ad494 hle: kernel: KClientPort: Cleanup comment format. 2021-05-10 15:41:46 -07:00
bunnei 7a06037c5f hle: ipc: Add declarations for TIPC. 2021-05-10 15:05:10 -07:00
bunnei ed25191ee6 hle: kernel: Further cleanup and add TIPC helpers. 2021-05-10 15:05:10 -07:00
bunnei d08bd3e062 hle: ipc_helpers: Update IPC response generation for TIPC. 2021-05-10 15:05:10 -07:00
bunnei ec50a9b5b9
Merge pull request #6291 from lioncash/kern-shadow 
kernel: Eliminate variable shadowing
 2021-05-09 20:15:00 -07:00
german77 0c1bb46f0a kernel: Delete unused files 2021-05-09 11:15:31 -05:00
Lioncash 2f62bae9e3 kernel: Eliminate variable shadowing 
Now that the large kernel refactor is merged, we can eliminate the
remaining variable shadowing cases.
 2021-05-08 12:33:26 -04:00
bunnei faa067f175
Merge pull request #6266 from bunnei/kautoobject-refactor 
Kernel Rework: Migrate kernel objects to KAutoObject
 2021-05-07 23:30:17 -07:00
bunnei 8acf739b3f
Merge pull request #6287 from lioncash/ldr-copy 
ldr: Simplify memory copy within LoadNro()
 2021-05-07 09:46:31 -07:00
Lioncash 8f638e81e9 ldr: Simplify memory copy within LoadNro() 
We can use the dedicated memory function for performing copies instead
of reading into a temporary buffer and then immediately writing it back
out to memory.

Eliminates a bit of heap memory churn.
 2021-05-06 19:18:14 -04:00
ameerj da62e92784 nvflinger: Create layers when they are queried but not found 
Fixes Shantae softlock on boot.
 2021-05-06 11:20:52 -04:00
bunnei d57b12193b hle: kernel: KPageTable: CanContain should not be constexpr. 2021-05-05 16:40:55 -07:00
bunnei b805ee653f hle: kernel: Move slab resource counts to Kernel. 2021-05-05 16:40:54 -07:00
bunnei d2c4dbde9e fixup! hle: kernel: Migrate KSharedMemory to KAutoObject. 2021-05-05 16:40:54 -07:00
bunnei 2c4615f3a6 fixup! hle: kernel: Migrate more of KThread to KAutoObject. 2021-05-05 16:40:54 -07:00
bunnei 510f71d871 fixup! hle: kernel: Ensure all kernel objects with KAutoObject are properly created. 2021-05-05 16:40:54 -07:00
bunnei 9f81221528 fixup! hle: kernel: Ensure all kernel objects with KAutoObject are properly created. 2021-05-05 16:40:54 -07:00
bunnei eae107d0e9 kernel: svc: Remove unused RetrieveResourceLimitValue function. 2021-05-05 16:40:54 -07:00
bunnei da22def511 hle: kernel: Fix un/sign mismatch errors with NUM_CPU_CORES. 2021-05-05 16:40:54 -07:00
bunnei f23760b1e1 fixup! hle: kernel: Add initial impl. of slab setup. 2021-05-05 16:40:54 -07:00
bunnei 1e983b19df fixup! hle: kernel: Migrate to KHandleTable. 2021-05-05 16:40:54 -07:00
bunnei ad5a5ef43f fixup! hle: kernel: Migrate more of KThread to KAutoObject. 2021-05-05 16:40:54 -07:00
bunnei 9434603450 fixup! hle: kernel: Migrate KReadableEvent and KWritableEvent to KAutoObject. 2021-05-05 16:40:54 -07:00
bunnei 703d7aaab6 fixup! hle: kernel: Migrate to KHandleTable. 2021-05-05 16:40:54 -07:00
bunnei 9beb239634 fixup! hle: kernel: Add initial impl. of KLinkedList. 2021-05-05 16:40:54 -07:00
bunnei 2cdc7142b0 fixup! hle: kernel: Migrate to KHandleTable. 2021-05-05 16:40:54 -07:00
bunnei 34abe4a905 fixup! hle: kernel: Migrate KPort, KClientPort, and KServerPort to KAutoObject. 2021-05-05 16:40:54 -07:00
bunnei f6d45b747e fixup! hle: kernel: Migrate KSession, KClientSession, and KServerSession to KAutoObject. 2021-05-05 16:40:53 -07:00
bunnei 1b074b8984 fixup! hle: kernel: Migrate KSession, KClientSession, and KServerSession to KAutoObject. 2021-05-05 16:40:53 -07:00
bunnei 50d2dc3b51 fixup! hle: kernel: Migrate KPort, KClientPort, and KServerPort to KAutoObject. 2021-05-05 16:40:53 -07:00
bunnei d23f9f75ff fixup! hle: kernel: Migrate to KHandleTable. 2021-05-05 16:40:53 -07:00
bunnei 4356361faf fixup! hle: kernel: Add initial impl. of KAutoObjectWithListContainer. 2021-05-05 16:40:53 -07:00
bunnei 51aa5a5364 fixup! hle: kernel: Add initial impl. of KAutoObjectWithListContainer. 2021-05-05 16:40:53 -07:00
bunnei 25538db150 fixup! hle: kernel: Add initial impl. of KAutoObject. 2021-05-05 16:40:53 -07:00
bunnei 9bae3992e6 fixup! hle: kernel: Add initial impl. of KAutoObject. 2021-05-05 16:40:53 -07:00
bunnei 91d8657959 fixup! hle: kernel: Add initial impl. of slab setup. 2021-05-05 16:40:53 -07:00
bunnei d3c166d4d5 common: Rename NON_COPYABLE/NON_MOVABLE with YUZU_ prefix. 2021-05-05 16:40:53 -07:00
bunnei 0536004d91 fixup! hle: kernel: Rename Process to KProcess. 2021-05-05 16:40:53 -07:00
bunnei 57f80c74b6 fixup! hle: kernel: Migrate to KHandleTable. 2021-05-05 16:40:53 -07:00
bunnei caa11748c6 fixup! hle: kernel: Improve MapSharedMemory and implement UnmapSharedMemory. 2021-05-05 16:40:53 -07:00
bunnei 7866eb03bb hle: kernel: svc: ConnectToNamedPort: Use KHandleTable::Reserve. 2021-05-05 16:40:53 -07:00
bunnei 4b03e6e776 hle: kernel: Migrate to KHandleTable. 2021-05-05 16:40:53 -07:00
bunnei 8f5052a514 hle: kernel: KClassToken: Ensure class tokens are correct. 2021-05-05 16:40:53 -07:00
bunnei 0b27c721c9 hle: kernel: Improve MapSharedMemory and implement UnmapSharedMemory. 2021-05-05 16:40:52 -07:00
bunnei 2a7eff57a8 hle: kernel: Rename Process to KProcess. 2021-05-05 16:40:52 -07:00
bunnei bf380b8584 hle: kernel: Remove deprecated Object class. 2021-05-05 16:40:52 -07:00
bunnei 864841eb9e hle: kernel: Do not shutdown twice on emulator close. 2021-05-05 16:40:52 -07:00
bunnei 39a8dba9a6 hle: kernel: Cleanup shutdown of persistent kernel objects. 2021-05-05 16:40:52 -07:00
bunnei 626f746971 hle: kernel: Migrate KPort, KClientPort, and KServerPort to KAutoObject. 2021-05-05 16:40:52 -07:00
bunnei 7a06864100 hle: kernel: Migrate KServerPort to KAutoObject. 2021-05-05 16:40:52 -07:00
bunnei 0297448fbc hle: kernel: Migrate KClientPort to KAutoObject. 2021-05-05 16:40:52 -07:00
bunnei aa2844bcf9 hle: kernel: HandleTable: Remove deprecated APIs. 2021-05-05 16:40:52 -07:00
bunnei b57c5a9b54 hle: kernel: Migrate KResourceLimit to KAutoObject. 2021-05-05 16:40:52 -07:00
bunnei 674122038a hle: kernel: svc: Migrate WaitSynchronization. 2021-05-05 16:40:51 -07:00
bunnei 126aaeb6d3 hle: kernel: svc: Use new handle table API for Process. 2021-05-05 16:40:51 -07:00
bunnei c7d8b7421c hle: kernel: Migrate KTransferMemory to KAutoObject. 2021-05-05 16:40:51 -07:00
bunnei 7444963bbb hle: kernel: Migrate KSession, KClientSession, and KServerSession to KAutoObject. 2021-05-05 16:40:51 -07:00
bunnei 2cb6106523 hle: kernel: svc: Migrate GetThreadContext, GetThreadCoreMask. 2021-05-05 16:40:51 -07:00
bunnei 76a0814142 hle: kernel: svc: Migrate GetProcessId, CancelSynchronization, SetThreadActivity. 2021-05-05 16:40:51 -07:00
bunnei 84bb772003 hle: kernel: KThread: Remove incorrect resource release. 2021-05-05 16:40:51 -07:00
bunnei 269d233a94 hle: kernel: svc_results: Update naming.. 2021-05-05 16:40:51 -07:00
bunnei c2f6f2ba7a hle: kernel: KThread: Add missing resource hint release. 2021-05-05 16:40:51 -07:00
bunnei 2e8d6fe9a0 hle: kernel: Migrate KReadableEvent and KWritableEvent to KAutoObject. 2021-05-05 16:40:51 -07:00
bunnei eba3bb9d21 hle: ipc_helpers: Add methods for copy/move references. 2021-05-05 16:40:51 -07:00
bunnei cfa7b92563 hle: kernel: Move slab heaps to their own container. 2021-05-05 16:40:51 -07:00
bunnei 89edbe8aa2 hle: kernel: Refactor several threads/events/sharedmemory to use slab heaps. 2021-05-05 16:40:51 -07:00
bunnei b6156e735c hle: kernel: Move slab heap management to KernelCore. 2021-05-05 16:40:51 -07:00
bunnei ab704acab8 hle: kernel: Ensure all kernel objects with KAutoObject are properly created. 2021-05-05 16:40:51 -07:00
bunnei 722195cf70 hle: kernel: Use unique_ptr for suspend and dummy threads. 2021-05-05 16:40:50 -07:00
bunnei addc0bf037 hle: kernel: Migrate KEvent to KAutoObject. 2021-05-05 16:40:50 -07:00
bunnei 086db71e94 hle: kernel: Migrate KSharedMemory to KAutoObject. 2021-05-05 16:40:50 -07:00
bunnei 7ccbdd4d8d hle: kernel: Migrate KProcess to KAutoObject. 2021-05-05 16:40:50 -07:00
bunnei 5e5933256b hle: kernel: Refactor IPC interfaces to not use std::shared_ptr. 2021-05-05 16:40:50 -07:00
bunnei da7e9553de hle: kernel: Migrate more of KThread to KAutoObject. 2021-05-05 16:40:50 -07:00
bunnei 6fca1c82fd hle: kernel: svc: Migrate GetThreadPriority, StartThread, and ExitThread. 2021-05-05 16:40:50 -07:00
bunnei de4746ff69 hle: kernel: svc: Migrate CreateThread. 2021-05-05 16:40:50 -07:00
bunnei 0eeecde67c hle: kernel: Migrate idle threads. 2021-05-05 16:40:50 -07:00
bunnei 479bd50b96 hle: kernel: Migrate KThread to KAutoObject. 2021-05-05 16:40:50 -07:00
bunnei d3d0f2f451 hle: kernel: Add initial impl. of slab setup. 2021-05-05 16:40:50 -07:00
bunnei 34bed1ab41 hle: kernel: Refactor out various KThread std::shared_ptr usage. 2021-05-05 16:40:50 -07:00
bunnei d9df63583f core: Defer CoreTiming initialization. 2021-05-05 16:40:50 -07:00
bunnei 3401676768 core: memory: Add a work-around to allocate and access kernel memory regions by vaddr. 2021-05-05 16:40:50 -07:00
bunnei 66f2ad716b hle: kernel: Add initial impl. of KLinkedList. 2021-05-05 16:40:49 -07:00
bunnei f93d939426 hle: kernel: Add initial impl. of KSlabAllocated. 2021-05-05 16:40:49 -07:00
bunnei 34ce1dd7c7 hle: kernel: Add initial impl. of KAutoObjectWithListContainer. 2021-05-05 16:40:49 -07:00
bunnei b8751630e2 hle: kernel: Add initial impl. of KAutoObject. 2021-05-05 16:40:49 -07:00
bunnei 260b841dc3
Merge pull request #6279 from ogniK5377/nvhost-prof 
nvdrv: /dev/nvhost-prof-gpu for production
 2021-05-05 16:16:13 -07:00
bunnei 0b7a03bd65
Update src/core/hle/service/nvdrv/interface.cpp 
Co-authored-by: Ameer J <52414509+ameerj@users.noreply.github.com>
 2021-05-05 16:16:02 -07:00
german77 8c30ed6d09 hid: Improve hardware accuracy of gestures 2021-05-05 10:13:09 -05:00
Lioncash cc47a6a9c2 service: Remove unused class variables 
Prevents some warnings from occurring.
 2021-05-05 01:32:28 -04:00
Lioncash 9e726a9250 service: Resolve cases of member field shadowing 
Now all that remains is for kernel code to be 'shadow-free' and then
-Wshadow can be turned into an error.
 2021-05-04 04:38:38 -04:00
bunnei df51eb9bde
Merge pull request #6278 from lioncash/misc-shadow 
core: Resolve misc straggler cases of variable shadowing
 2021-05-03 16:04:28 -07:00
Lioncash ebb64d5bf4 core: Resolve misc cases of variable shadowing 
Resolves shadowing warnings that aren't in a particularly large
subsection of core. Brings us closer to turning -Wshadow into an error.

All that remains now is for cases in the kernel (left untouched for now
since a big change by bunnei is pending), and a few left over in the
service code (will be tackled next).
 2021-05-03 01:19:13 -04:00
Chloe Marcec 7d257ce7bd nvdrv: /dev/nvhost-prof-gpu for production 
While we're at it, we can fix the is_initialized error code.
This fixes the crashes on Shante
 2021-05-03 14:39:03 +10:00
german77 08d5bd36d8 hid: Fix touch not initializing properly if disabled 2021-05-02 21:27:15 -05:00
bunnei c17a59b58e
Merge pull request #6269 from lioncash/file-shadow 
file_sys: Resolve cases of variable shadowing
 2021-05-02 15:12:07 -07:00
bunnei 01a57d4c8d
Merge pull request #6265 from Morph1984/snap-save-fix 
service: filesystem: Return proper error codes for CreateFile
 2021-05-02 00:45:18 -07:00
Lioncash 1da72c7792 file_sys: Resolve cases of variable shadowing 
Brings us closer to enabling -Wshadow as an error in the core code.
 2021-05-02 02:59:57 -04:00
Morph 72b22fd433 service: filesystem: Return proper error codes for CreateFile 
This improves the accuracy of CreateFile by returning the correct error codes on certain conditions (parent directory does not exist, path already exists).

This fixes saving and the loading of existing saves in New Pokemon Snap
 2021-05-01 09:33:00 -04:00
german77 1ed1dd3c89 Disable touch if setting is not enabled 2021-04-30 19:28:21 -05:00
bunnei fa3ffff8de
Merge pull request #6257 from Morph1984/fix-use-after-free-webapplet 
applets/web: Fix a use-after-free when passing in the URL string
 2021-04-30 14:48:32 -07:00
bunnei 922b0d9933
Merge pull request #6226 from german77/sevensix 
hid: Implement SevenSixAxis and ConsoleSixAxisSensor
 2021-04-29 22:06:57 -07:00
Morph 0af182baa2 applets/web: Fix a use-after-free when passing in the URL string 
The URL string was being deleted before being used, leading to a use-after-free occurring when it is used afterwards.

Fix this by taking the string by const ref to extend its lifetime, ensuring it doesn't get deleted before use.
 2021-04-28 12:34:28 -04:00
Lioncash 724c19a307 loader: Resolve instances of variable shadowing 
Eliminates variable shadowing cases across all the loaders to bring us
closer to enabling variable shadowing as an error in core.
 2021-04-27 12:48:15 -04:00
german77 cfdec68d5a address comments 2021-04-26 22:07:16 -05:00
Lioncash dcb91ca4a4 service: Eliminate cases of member shadowing 
Resolves a few localized instances of member variable shadowing. Brings
us a little closer to turning shadowing warnings into errors.
 2021-04-26 09:39:49 -04:00
ameerj 75e0d16caa nvhost_vic: Fix device closure 
Implements the OnClose method of the nvhost_vic device, and removes the remnants of an older implementation.

Also cleans up some of the surrounding code.
 2021-04-24 19:22:09 -04:00
Mat M 4c8c5ad1b6
Merge pull request #6234 from Morph1984/stub-am 
ICommonStateGetter: Stub SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled
 2021-04-24 12:37:34 -04:00
Mat M 98fb36cb0a
Merge pull request #6235 from german77/ectx_aw 
glue: Add ectx:aw service placeholder
 2021-04-24 12:37:12 -04:00
german77 a02c4686c3 glue: Add ectx:aw placeholder 2021-04-24 10:50:25 -05:00
bunnei 1acd807176
Merge pull request #6230 from Morph1984/default-resource-size 
program_metadata: Set a default resource size when a NPDM is not present
 2021-04-24 02:55:20 -07:00
bunnei f4610e77e2
Merge pull request #6227 from lioncash/meta 
program_metadata: Explicitly specify copy/move operators/functions
 2021-04-23 23:12:44 -07:00
german77 c19ad21ae8 hid: Implement SevenSixAxis and ConsoleSixAxisSensor 2021-04-23 22:12:41 -05:00
Morph 04d9c27120 ICommonStateGetter: Stub SetRequestExitToLibraryAppletAtExecuteNextProgramEnabled 
- Used by Pixel Game Maker Series Werewolf Princess Kaguya
 2021-04-23 23:04:22 -04:00
bunnei 4cc8ab8a86
Merge pull request #6228 from lioncash/semi 
lm: Resolve -Wextra-semi warning
 2021-04-23 19:59:20 -07:00
bunnei 2e268abe42
Merge pull request #6229 from lioncash/unused-var 
acc/lbl: Remove unused variables
 2021-04-23 15:48:47 -07:00
bunnei 51c787bfc1
Merge pull request #6231 from lioncash/aes 
aes_util: Make use of std::span
 2021-04-23 11:37:17 -07:00
Morph 1c65b3ee53 program_metadata: Set a default resource size when a NPDM is not present 
Sets a default size of 0x1FE00000 bytes (510 MiB) for the system_resource_size when a NPDM is not present.
 2021-04-23 12:47:31 -04:00
bunnei 19bbdedf00
Merge pull request #6232 from lioncash/alias2 
emu_window: unsigned -> u32
 2021-04-23 09:26:56 -07:00
Lioncash d363b2c7d2 emu_window: Return pair from ClipToTouchScreen() instead of tuple 
This is only a 2-tuple, so it can be converted over to the std::pair
class.
 2021-04-23 11:21:02 -04:00
Lioncash 8805233f5e emu_window: unsigned -> u32 
This is more concise and consistent with the rest of the codebase.
 2021-04-23 11:19:32 -04:00
Lioncash 9c5248d101 aes_util: Make use of std::span 
Allows us to simplify the interface quite a bit as it will handle
contiguous sequences for us.
 2021-04-23 09:58:41 -04:00
Lioncash 502f3cef87 acc/lbl: Remove unused variables 2021-04-23 09:39:56 -04:00
Lioncash 29cd40bded lm: Make use of insert_or_assign() in Log() 
Avoids unnecessary default construction of an entry in cases where no
entry exists before overwriting the created entry.
 2021-04-23 09:27:18 -04:00
Lioncash 5ba49f188b lm: Prevent redundant map lookups in Log() 
We can perform the lookup and then do the contains check by checking the
end iterator. The benefit of this is that if we *do* find an entry, then
we aren't hashing into the map again to find it.

We can also get rid of an unused std::vector temporary while we're at
it.
 2021-04-23 09:24:21 -04:00
Lioncash 6e2040c955 lm: Resolve -Wextra-semi warning 
Resolves a trivial warning with clang.
 2021-04-23 09:20:54 -04:00
Lioncash ae93402312 program_metadata: Explicitly specify copy/move functions 
The generation of the copy assignment operators are deprecated on being
generated when a user-provided destructor is present.

We can explicitly specify that we desire this behavior to keep the class
forward compatible with future standards.
 2021-04-23 09:16:17 -04:00
Morph 86278f5db2 service: hid: Get transfer memory for InitializeSevenSixAxisSensor 2021-04-22 05:50:46 -04:00
bunnei f0c2190ceb
Merge pull request #6214 from Morph1984/time-fix-kirby-clash 
time: Fix GetClockSnapshotFromSystemClockContext
 2021-04-21 11:17:58 -07:00
bunnei 17704271f4
Merge pull request #6217 from Morph1984/consistent-writebuffers 
general: Write buffers before pushing raw arguments
 2021-04-19 20:54:25 -07:00
bunnei e5e9bee1cc
Merge pull request #6215 from lioncash/duplicate 
npad: Remove duplicated class member variable
 2021-04-19 18:12:48 -07:00
Morph 27eeb20001 general: Write buffers before pushing raw arguments 
For consistency with the rest of the service implementations
 2021-04-19 12:45:50 -04:00
Lioncash 9f39f7c041 arp: Use type alias for issue function 
Reduces some verbosity and centralizes the function details in one spot.
 2021-04-19 12:36:10 -04:00
Lioncash b7d04d848d arp: Prevent uninitialized read of launch member variable 
If anything happened to call arp functions in the wrong order and called
IRegistrar's Issue function before SetApplicationLaunchProperty, we'd
read from an uninitialized ApplicationLaunchProperty instance.

Instead, we can always initialize it so if this does happen, then the
outcome of doing such a thing is at least consistently reproducible.
 2021-04-19 12:30:34 -04:00
Lioncash 39497183a6 npad: Remove duplicated class member variable 
ControllerBase already has a System reference that can be accessed from
this class, so we can get rid of this to make the class layout a little
more straightforward.
 2021-04-19 12:23:28 -04:00
Morph 8285776603 time: Write buffer before pushing RESULT_SUCCESS in GetClockSnapshot 2021-04-19 12:09:28 -04:00
Morph a223006c50 time: Fix GetClockSnapshotFromSystemClockContext 
This removes an incorrect alignment usage and corrects the positions of the popped parameters.

- Fixes Super Kirby Clash crashing on boot
 2021-04-19 11:17:47 -04:00
Morph 51ca93981d applets: Send focus state change message on applet state change 
Fixes the softlock after the controller applet exits in Mario Kart 8 Deluxe.
 2021-04-17 09:26:48 -04:00
Morph ba2c917842 applets: Make the applet mode a protected property of Applet 2021-04-17 08:50:49 -04:00
bunnei 9ad77ba6d3
Merge pull request #6125 from ogniK5377/nvdec-close-dev 
nvdrv: Cleanup CDMA Processor on device closure
 2021-04-16 23:14:44 -07:00
Morph aa3adf6c3f input_interpreter: Fix button hold being interpreted incorrectly on init 
We reset all the button states to 0 except the first index (which has all the buttons as pressed) to prevent a button hold being interpreted as a button that was pressed once on the first poll.
 2021-04-15 01:53:17 -04:00
Morph 578e6c5a57 applets/swkbd: Implement the Default Software Keyboard frontend 2021-04-15 01:53:17 -04:00
Morph 5bc9f15c6d applets/swkbd: Implement the Normal and Inline Software Keyboard Applet 2021-04-15 01:53:17 -04:00
Morph a8c09cd5e4 ILibraryAppletCreator: Implement CreateHandleStorage 
Used by Monster Hunter Generations Ultimate
 2021-04-15 01:53:16 -04:00
Morph e3e6a11ab8 hle_ipc: Add helper functions to get copy/move handles 2021-04-15 01:53:16 -04:00
Morph 0a40106cf1 ILibraryAppletAccessor: Demote from ERROR to DEBUG for null storage logs 
Avoids unnecessary console spam when the inline software keyboard is used.
 2021-04-15 01:53:16 -04:00
Morph d1e40dd244 applets: Pass in the LibraryAppletMode each applet's constructor 2021-04-15 01:53:16 -04:00