summaryrefslogtreecommitdiffstats
path: root/src/core (unfollow)
Commit message (Collapse)AuthorFilesLines
2014-09-21Use the citra user path for the sdmc directoryarchshift1-2/+1
2014-09-17Kernel: Implement the Close command for Archive, File and Directory.Emmanuel Gil Peyrot2-0/+43
2014-09-17FS: Implement OpenArchive, OpenDirectory, OpenFile and OpenFileDirectly calls.Emmanuel Gil Peyrot1-20/+177
2014-09-17Kernel: Add a Directory object and a getter for it from an Archive object.Emmanuel Gil Peyrot3-0/+91
2014-09-17Core: Add a method to obtain a Directory from an Archive.Emmanuel Gil Peyrot5-0/+44
2014-09-17Core: Add a Directory object, with both a stub and a passthrough implementations.Emmanuel Gil Peyrot6-0/+264
2014-09-17Kernel: Add a File object and a getter for it from an Archive object.Emmanuel Gil Peyrot2-0/+118
2014-09-17Core: Add a passthrough backend for the filesystem, exposed as SDMC.Emmanuel Gil Peyrot5-0/+302
2014-09-17Core: Add a new File class, obtainable from an Archive, and a stub implementation.Emmanuel Gil Peyrot7-0/+208
2014-09-17Common: Rename the File namespace to FileUtil, to match the filename and prevent collisions.Emmanuel Gil Peyrot3-5/+5
2014-09-15Core: Get rid of unnecessary switch statement in KernelLioncash1-41/+2
2014-09-14Core: Fix warnings in gpu.cppLioncash1-6/+6
2014-09-13Core: Replace a sprintf in core_timing with StringFromFormatLioncash1-5/+7
2014-09-12Added support for multiple input device types for KeyMap and connected Qt.Kevin Hartman2-113/+127
2014-09-12Initial HID PAD work, with GLFW only.Kevin Hartman2-24/+197
2014-09-12Created structure for PAD.Kevin Hartman2-0/+28
2014-09-09core: Prune redundant includesarchshift20-37/+0
2014-09-09Added string_util to common, small changes in loader.cpparchshift3-56/+55
2014-09-09loader.cpp: improved file extension checking, made Upper/LowerStr usefularchshift1-6/+8
Instead of forcibly taking the last 4 characters, it now finds the last extension separator (the period) and takes a substr of its location.
2014-09-07Removed common/std_xyz, instead using the std headerarchshift1-1/+1
2014-09-07Dead code removal: video_core.cpp, load_symbol_map.cpparchshift1-1/+1
2014-09-06core: Make the ARM disassembler use std::string internallyLioncash3-189/+143
2014-09-06ncch: Remove C-style struct typedefsLioncash1-4/+4
In C++ you can simply just declare it as is.
2014-09-06ncch: inline declare some variables in LZSS_DecompressLioncash1-7/+5
2014-09-06core: Pass string by reference in FetchFromPortName and DeleteServiceLioncash2-4/+4
2014-09-03Removed common/atomic, instead using std::atomicarchshift1-4/+4
2014-09-01Remove hand-crafted Visual Studio solution.Yuri Kunde Schlesner2-592/+0
2014-09-01CMake cleanupYuri Kunde Schlesner1-47/+56
Several cleanups to the buildsystem: - Do better factoring of common libs between platforms. - Add support to building on Windows. - Remove Qt4 support. - Re-sort file lists and add missing headers.
2014-08-31GPU: Improve frame synchronization, increases compatibility with both homebrew and retail applications.bunnei1-13/+31
2014-08-31Core: Refactor core to use only one function for execution.bunnei2-20/+17
Core: Cleaned up comment to be more readable. Citra: Changed loop to be more readable.
2014-08-31Loader: Added support for loading raw BIN executables.bunnei2-0/+21
- Useful for debugging homebrew Qt: Updated GUI to support loading .bin files.
2014-08-31Threading: Fix thread starting to execute first instruction correctly.bunnei2-1/+6
2014-08-31srv::Initialize: Return "success" status code.bunnei1-0/+4
2014-08-31Introduce VAddr and PAddr typedefs for ARM addresses.Yuri Kunde Schlesner2-31/+40
2014-08-28Loader: Added support for loading raw BIN executables.bunnei2-0/+21
- Useful for debugging homebrew Qt: Updated GUI to support loading .bin files.
2014-08-28Threading: Fix thread starting to execute first instruction correctly.bunnei2-1/+6
2014-08-28srv::Initialize: Return "success" status code.bunnei1-0/+4
2014-08-26VideoCore: Fixes rendering issues on Qt and corrects framebuffer output size.bunnei1-9/+8
2014-08-25GPU: Fix a compiler warning about redundant semicolons.Tony Wasserka1-2/+2
2014-08-25Pica/citra-qt: Replace command list view and command list debugging code with something more sophisticated.Tony Wasserka1-5/+0
2014-08-25GSP: Update framebuffer information when necessary.Tony Wasserka2-2/+41
2014-08-25GSP: Implement SetBufferSwap.Tony Wasserka2-1/+47
2014-08-25GSP: Add a helper function for convenience.Tony Wasserka1-17/+22
2014-08-23Added FS functions to Archive and Archive_RomFSarchshift4-11/+88
2014-08-20ARM: Remove a forgotten const in vfp.Emmanuel Gil Peyrot2-2/+2
2014-08-19Core: Use std::array for managing kernel object spaceLioncash2-5/+5
These avoid relying on memset for clearing the arrays.
2014-08-19SVC: Added support for svc_GetSystemTick.bunnei2-19/+48
Changed HLE function return methods to be static inline functions.
2014-08-18Core: Alter the kernel string functions to use std::string instead of const char*.Lioncash16-41/+38
Most functions already operate on std::strings. This also removes the need to manually null terminate thread names.
2014-08-17Core: Fix a formatting error in svc.cppLioncash1-3/+2
entry_point would not be added to the string. Also used StringFromFormat so that the buffer is unnecessary.
2014-08-17Core: Fix undefined behavior in mem_map_funcs' WriteBlock functionLioncash1-4/+8
2014-08-13HID: Added new function entries from 3dbrew to FunctionTable.bunnei1-0/+5
HID: Fix typo with DisableGyroscopeLow command.
2014-08-12Pica: Add command processor.Tony Wasserka1-3/+5
2014-08-12Pica/GPU: Change hardware registers to use physical addresses rather than virtual ones.Tony Wasserka6-208/+72
This cleans up the mess that address reading/writing had become and makes the code a *lot* more sensible. This adds a physical<->virtual address converter to mem_map.h. For further accuracy, we will want to properly extend this to support a wider range of address regions. For now, this makes simply homebrew applications work in a good manner though.
2014-08-12GSP: Fix a major regression introduced in ffda035c, due to which no display transfers were triggered at all anymore.Tony Wasserka1-4/+13
2014-08-12Remove the fancy RegisterSet class introduced in 4c2bff61e.Tony Wasserka3-150/+230
While it was some nice and fancy template usage, it ultimately had many practical issues regarding length of involved expressions under regular usage as well as common code completion tools not being able to handle the structures. Instead, we now use a more conventional approach which is a lot more clean to use.
2014-08-08HID: Implemented HID_User::GetIPCHandles service function.bunnei1-5/+39
2014-08-08SVC: Fixed typo with MapMemoryBlock DEBUG_LOG call.bunnei1-1/+1
2014-08-07GPU: Updated g_last_ticks variable to be more descriptive (represents CPU tick count of last vertical line).bunnei1-5/+5
2014-08-07GPU: Updated horizontal sync line counter to use framebuffer height.bunnei1-2/+3
2014-08-07Thread: Added more descriptive comment to WaitCurrentThread.bunnei2-2/+10
2014-08-07GSP: Cleaned up command buffer decoding.bunnei2-61/+69
GSP: Cleaned up code and added additional comments. GSP: Removed unnecessary TODO comment. GSP: Changed u32 iterators in TriggerCmdReqQueue to unsigned.
2014-08-06GSP: Added reinitialization of other state objects.bunnei1-0/+3
2014-08-06GSP: Removed dumb GX prefixes to functions/structs in GSP namespace.bunnei3-79/+80
- Various other cleanups.
2014-08-06GSP: Removed unnecessary GX_FinishCommand function.bunnei1-13/+5
2014-08-06GSP: Implements preliminary command synchronization via GPU interrupts.bunnei4-29/+140
Core: Added a comment to explain the logic for the RunLoop iterations.
2014-08-06MemMap: Fixed typo with GetPointer to VRAM address.bunnei1-1/+1
2014-08-06AddressArbiter: Removed unnecessary HLE::Reschedule.bunnei1-1/+0
2014-08-06AddressArbiter: Fixed bug with break statements missing from case statements.bunnei1-0/+2
2014-08-06SRV: Updated GetProcSemaphore to create an event instead of a mutex.bunnei1-8/+10
2014-08-06SVC: Removed ArbitrateAddress log message that spams to much.bunnei1-2/+0
2014-08-06Kernel: Updated Event and Mutex to specify handle that they are blocking for.bunnei2-2/+2
2014-08-06MemMap: Added an error for unaligned 16-bit memory reads.bunnei1-0/+7
2014-08-06MemMap: Removed Read64 function.bunnei1-6/+0
- Unused code - Was not correct for unaligned memory reads
2014-08-06FS: Fix port name (old port name was based on an unaligned memory read).bunnei1-1/+1
2014-08-06MemMap: Fix Read32 for unaligned memory reads.bunnei1-12/+23
MemMap: Cleaned up Read32 unaligned memory access.
2014-07-24ARM: Synchronize Citra's SkyEye core with 3dmoo's.bunnei6-5919/+5303
2014-07-23Use uniform formatting when printing hexadecimal numbers.Tony Wasserka1-3/+3
2014-07-23Fix a few warnings.Tony Wasserka3-7/+7
Templates shouldn't be marked as inline if they aren't defined in the header.
2014-07-23GPU: Clarify display transfer code.Tony Wasserka1-12/+15
Also makes the illogical component order more obvious.
2014-07-23GPU: Add documentation.Tony Wasserka1-2/+14
2014-07-23GSP: Add a few comments.Tony Wasserka2-1/+15
2014-07-23GSP: Clean up GX command processing a lot and treat command id as a u8 rather than a u32.Tony Wasserka2-37/+79
Anonymous structs are not standard C++, hence don't use them.
2014-07-23RegisterSet: Simplify code by using structs for register definition instead of unions.Tony Wasserka2-133/+123
2014-07-23GPU: Make use of RegisterSet.Tony Wasserka3-327/+200
2014-07-23GPU: Make framebuffer code format-aware.Tony Wasserka1-6/+47
2014-07-23GPU: Interface cleanup.Tony Wasserka2-13/+20
2014-07-23GPU: Initialize GPU registers to some sensible default state.Tony Wasserka1-1/+16
2014-07-23GPU: Emulate memory fills.Tony Wasserka4-3/+89
2014-07-23GPU: Add proper framebuffer register handling.Tony Wasserka2-11/+105
2014-07-23GPU: Properly implement display transfers.Tony Wasserka1-1/+19
2014-07-23GPU: Add display transfer configuration.Tony Wasserka2-0/+92
2014-07-23GSP: HLE GXCommandId::SET_DISPLAY_TRANSFER and GXCommandId::SET_TEXTURE_COPY.Tony Wasserka2-2/+17
2014-07-23GSP: Implement ReadHWRegs and WriteHWRegs properly.Tony Wasserka1-27/+46
2014-07-22Use a more compatible choice of initial framebuffer addresses.Tony Wasserka1-10/+22
2014-07-20core: Kill off type redefenitions in armdefs.hLioncash1-7/+0
2014-07-09Kernel: Added preliminary support for address arbiters.bunnei7-9/+144
AddressArbiter: Added documentation comment, fixed whitespace issue. AddressArbiter: Fixed incorrect comment, reordered if-statement to be more clear. SVC: Removed trailing whitespace.
2014-07-09Thread: Added functions to resume threads from address arbitration.bunnei2-0/+44
Thread: Cleaned up arbitrate address functions. Thread: Cleaned up ArbitrateAllThreads function.
2014-07-08function_wrappers: Fixed incorrect wrapper, added another.bunnei1-2/+9
2014-07-05SharedMemory: Updated MapSharedMemory to use an enum for permissions.bunnei3-16/+36
- Also added some safety checks to MapSharedMemory.
2014-07-05Memory: Removed deprecated MapBlock_Shared function.bunnei2-30/+0
2014-07-05GSP: Fixed to use real shared memory object, various cleanups.bunnei2-30/+40
- Previously, used a hard-coded shared memory handle of 0x10002000 (as used by libctru homebrew) GSP: Added name for shared memory. GSP: Cleaned up assertion message.
2014-07-05Kernel: Added support for shared memory objects.bunnei5-0/+142
SharedMemory: Added optional name field for tracking known objects.
2014-07-05mem_map: Updated interface to expose template functions to other modules.bunnei2-10/+16
2014-07-05NCCH: Updated ExeFS memory allocation to be safer.bunnei2-1/+7
2014-07-05Archive: Added Init/Shutdown methods to reset kernel archive state.bunnei3-0/+19
2014-07-05Marked AppLoader_ELF, AppLoader_NCCH, and Archive_RomFS virtual functions as "override".bunnei3-13/+13
2014-07-05Marked AppLoader_ELF, AppLoader_NCCH, and Archive_RomFS classes as "final"bunnei3-3/+3
2014-07-05Loader: Updated read methods to be constbunnei5-68/+79
- Required "file" handle to be made local and explicitly opened/closed as needed
2014-07-05FileSys: Added preliminary support for applications reading the RomFS archive.bunnei11-160/+311
Archive: Fixed brace ugliness for neobrain :) FS: Commented out unused local variables to prevent warnings. ...But keeping them here for future use. archive_romfs: Removed unused #include.
2014-07-04APT: Added stubbed ReceiveParameter and various cleanups.bunnei1-71/+93
APT: More cleanups. APT: Changed SignalType to be type u32.
2014-06-27Loader: Refactored interface such that data is no longer stored by loader.bunnei3-96/+73
NCCH: Removed extra qualification ‘Loader::AppLoader_NCCH::’.
2014-06-27FS: Added stubbed code to intercept and decode file system service functions.bunnei6-0/+164
FS: Added to CMakeLists.txt
2014-06-27Kernel: Added stubbed code to support creation of kernel Archive objects.bunnei6-0/+95
2014-06-27Core: Removed unused directory_file_system and meta_file_system modules.bunnei9-1477/+0
Core: Updated CMakeLists.txt to remove directory_file_system and meta_file_system modules.
2014-06-25Loader: Refactored loading functions to only read data from binary if called.bunnei3-74/+141
NCCH: Updated LoadExec to use Memory::WriteBlock function to load binary code.
2014-06-25MemMap: Added a WriteBlock function to write a buffer of data to memory.bunnei2-0/+14
2014-06-25ELF: Refactored LoadInto(..) to use memcpy, removed unnecessary code.bunnei1-19/+8
2014-06-25Loader: Refactored use of const.bunnei6-20/+19
2014-06-25NCCH: Added RomFS loading.bunnei2-1/+36
2014-06-25NCCH: Fixes reduce unnecessary logging and load logo/banner/etc. sections correctly.bunnei3-22/+29
Loader: Added ErrorNotUsed ReturnStatus type to specify when something is not used.
2014-06-25Loader: Implemented AppLoader interface for abstracting application loading.bunnei6-523/+672
- Various cleanups/refactorings to Loader, ELF, and NCCH modules. - Added AppLoader interface to ELF and NCCH. - Updated Qt/GLFW frontends to check AppLoader ResultStatus. NCCH: Removed extra qualification typos. Loader: Removed unnecessary #include's. NCCH: Improved readability of memcmp statements. NCCH: Added missing space. Elf: Removed unnecessary usage of unique_ptr. Loader: Removed unnecessary usage of unique_ptr.
2014-06-17NCCH: Changed decompression to load .code directly into memory rather than an intermediate buffer.bunnei1-9/+3
2014-06-17Elf: Removed unused macros, changed #include of "common.h" to just "common_types.h".bunnei1-117/+1
2014-06-17Loader: Cleaned up and removed unused code, refactored ELF namespace.bunnei4-209/+70
2014-06-17Elf: Renamed modules to be consistent with new loader naming, fixed tabs -> spaces.bunnei8-372/+342
2014-06-17Loader: Added support for booting NCCH executables.bunnei6-0/+384
NCCH: Fixed typo in printing NCCH filename.
2014-06-17Loader: Moved elf and loader modules to a "loader" subdirectory.bunnei8-30/+34
2014-06-16Loader: Added stubbed detection of CXI and CCI files.bunnei1-0/+6
2014-06-16Loader: Removed unused CXI and DAT loading code.bunnei1-76/+0
2014-06-13Kernel: Removed unnecessary "#pragma once".bunnei1-2/+0
2014-06-13Kernel: Added freeing of kernel objects on emulator shutdown.bunnei3-0/+13
2014-06-13Event: Updated several log messages to be assertions.bunnei1-16/+8
2014-06-13HLE: Moved "PARAM" and "RETURN" macros to function_wrappers.h (this is only module where they are needed).bunnei2-5/+6
2014-06-13SVC: Renamed all function wrapper templates to Wrap, moved to HLE namespace.bunnei2-157/+145
2014-06-13Thread: Renamed occurrences of "t" to "thread" to improve readability.bunnei1-48/+45
2014-06-13Thread: Cleaned up VerifyWait, fixed issue where nullptr msg could unnecessarily be logged.bunnei1-9/+7
2014-06-13HLE: Removed usnused EatCycles function.bunnei3-15/+0
2014-06-13SVC: Cleaned up function wrappers to pass in correct argument types.bunnei2-870/+201
2014-06-13Thread: Moved position of * in arguments.bunnei1-2/+2
2014-06-13Thread: Updated VerifyWait to be more readable (but functionally the same).bunnei1-4/+3
2014-06-13SVC: Moved declaration of "wait" variable in SendSyncRequest for improved readability.bunnei1-1/+1
2014-06-13HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)bunnei13-239/+239
2014-06-13Kernel: Updated various kernel function "name" arguments to be const references.bunnei4-6/+6
2014-06-13HLE: Updated various handle debug assertions to be more clear.bunnei4-10/+10
2014-06-13Mutex: Moved ReleaseMutex iterator declaration to be inside while loop.bunnei1-2/+1
2014-06-13Kernel: Updated several member functions to be constbunnei5-13/+13
2014-06-13Core: Cleaned up SingleStep(), updated default LCD refresh to assume each instruction is ~3 cyclesbunnei2-12/+14
2014-06-13Core: Changed HW update/thread reschedule to occur more frequently (assume each instruction is ~3 cycles)bunnei1-2/+2
2014-06-13Thread: Fixed bug with ResetThread where cpu_registers[15] was being incorrectly setbunnei1-1/+1
2014-06-13Kernel: Made SyncRequest not pure virtual, with a default implementation of error (as this is not required for all kernel objects)bunnei3-23/+4
2014-06-13Kernel: Added real support for thread and event blockingbunnei6-76/+196
- SVC: Added ExitThread support - SVC: Added SignalEvent support - Thread: Added WAITTYPE_EVENT for waiting threads for event signals - Thread: Added support for blocking on other threads to finish (e.g. Thread::Join) - Thread: Added debug function for printing current threads ready for execution - Thread: Removed hack/broken thread ready state code from Kernel::Reschedule - Mutex: Moved WaitCurrentThread from SVC to Mutex::WaitSynchronization - Event: Added support for blocking threads on event signalling Kernel: Added missing algorithm #include for use of std::find on non-Windows platforms.
2014-06-12GPU debugger: Add functionality to inspect command lists.Tony Wasserka1-0/+4
2014-06-12GPU: Cleanup register definitions.Tony Wasserka3-31/+31
2014-06-12Rename LCD to GPU.Tony Wasserka8-36/+36
2014-06-12Add initial graphics debugger interface.Tony Wasserka1-0/+6
2014-06-12GSP: Define more GX commands.Tony Wasserka2-14/+54
2014-06-12Pica: Add command list registers.Tony Wasserka2-5/+52
2014-06-05hle: added a hokey way to force a thread reschedule during CPU single step mode (as used by the debugger)bunnei3-1/+7
2014-06-05arm: fixed a bug where ARM_Interpreter::ExecuteInstructions was actually executing one more instruction than expectedbunnei1-1/+1
2014-06-05kernel: changed current default thread priority back to 0x30 - I think this is more correctbunnei1-1/+1
2014-06-05arm: fixed bug in how thread context switch occurs with SkyEyebunnei2-2/+9
2014-06-05service: added a error log messages for unimplemented WaitSynchronizationbunnei1-0/+1
2014-06-05arm: reverting a change made with cb0663de - this has to have been a typo!bunnei1-1/+1
2014-06-03svc: added optional name field to Event and Mutex (used for debugging)bunnei6-12/+25
2014-06-03kernel: moved position of * for GetTypeName and GetNamebunnei1-2/+2
2014-06-03coprocessor: reenabled debug logbunnei1-1/+1
2014-06-02svc: updated WaitSynchronizationN to properly use first pointer argumentbunnei2-4/+6
2014-06-02svc: changed DuplicateHandle log message from "error" to "debug"bunnei1-1/+1
2014-06-02svc: added GetThreadPriority and SetThreadPriority, added (incomplete) DuplicateHandle supportbunnei3-3/+77
2014-06-02kernel: changed main thread priority to default, updated Kernel::Reschedule to use PrepareReschedulebunnei6-9/+17
2014-06-02arm: added option to prepare CPU core (while mid-instruction) for thread reschedulebunnei3-0/+11
2014-06-02svc: cleaned up function_wrappers, updated various SVCs to make use of pointer argumentsbunnei2-31/+40
2014-06-01Added 'this' reference to num_instructions field so it's properly updated,as before the method was affecting the local method parameter rather than the class fieldDisruption1-1/+1
2014-06-01svc: added missing function wrapper for SleepThreadbunnei1-0/+4
2014-06-01gsp: always pass through synchronization barrier for commandsbunnei1-1/+16
2014-06-01svc: updated waitSychronization to not overwrite handle on return, added stub for SleepThread (does nothing)bunnei1-2/+21
2014-06-01thread: updated Reschedule to sit at a synchronization barrier when no other threads are ready for executionbunnei1-0/+18
2014-06-01event: added a hackish ability to set an event as "locked" to its current state, cleaned up some commentsbunnei2-4/+32
2014-05-30hle: added stubbed service for ndm_ubunnei5-0/+74
2014-05-30service: cleaned up log messagesbunnei1-2/+2
2014-05-30service: removed PT_A from, as this was just an alias for APT_Ubunnei1-2/+0
2014-05-30srv: fix to log unimplemented service (instead of crash)bunnei1-6/+2
2014-05-30mutex: fixed typo in ReleaseMutexbunnei1-1/+3
2014-05-30hle: cleaned up log messagesbunnei8-45/+49
2014-05-30svc: updated OutputDebugString to use OS_LOGbunnei1-1/+1
2014-05-30arm: removed unnecessary code when calling SVC from skyeyebunnei1-16/+0
2014-05-30core: changed time delay before kernel reschedule to "approximate" a screen refreshbunnei1-3/+12
2014-05-30svc: changed unimplemented SVC log messages from "debug" messages to "error" messagesbunnei1-8/+8
2014-05-30svc: added svcClearEvent, stubbed function for svcArbitrateAddress, and various fixesbunnei2-22/+38
- force kernel reschedule after svcWaitSynchronization - fixed some bugs with passing in pointer arguments - cleaned up some comments and log messages
2014-05-30event: added support for ClearEvent, fixed a bug with CreateEvent, fixed some commentsbunnei2-9/+14
2014-05-30service: added additional hack to return success on unimplemented service callsbunnei1-2/+10
2014-05-30srv: changed a NOTICE_LOG to DEBUG_LOGbunnei1-1/+1
2014-05-30svc: added ArbitrationType enumerationbunnei1-0/+9
2014-05-29apt: added stubbed function for InquireNotificationbunnei1-78/+86
2014-05-29hle: properly cast 64-bit function wrapper parameters to (u64)bunnei1-2/+2
2014-05-29hle: removed PARAM64 macro (this was incorrect), made several bug fixes accordingly for decoding U64 function parametersbunnei2-3/+2
2014-05-29lcd: moved kFrameTicks to lcd.h for use in other modulesbunnei2-2/+2
2014-05-29service: changed interface to return 0 (no error) when a service method is unimplemented - hack to make apps boot furtherbunnei1-2/+2
2014-05-28APT_U: added stubbed function for APT_U::Enable, fixed some log messages to be more consistentbunnei1-3/+10
2014-05-28mutex: added preliminary SyncRequest/WaitSynchronization, added some comments/assertionsbunnei1-0/+6
2014-05-28svc: implemented WaitSynchronization1, WaitSynchronizationN, and CreateEventbunnei1-14/+54
2014-05-28APT_U: added event creation to Initialize methodbunnei1-1/+11
2014-05-28event: fixed typos and updated CMakeListsbunnei2-1/+2
2014-05-28event: added SetEventLocked method to change status an events lockbunnei2-0/+18
2014-05-28kernel: added event module to support creation of CTR "Event" objectsbunnei4-0/+127
2014-05-27mutex: removed docstring comment that is no longer relevantbunnei1-1/+0
2014-05-27mutex: added additional docstringsbunnei1-0/+2
2014-05-27kernel: added WaitSynchronization method to Kernel::Objectbunnei4-0/+39
2014-05-27kernel: updated SyncRequest to take boolean thread wait result as a parameterbunnei5-10/+33
2014-05-27svc: added some assertionsbunnei1-6/+4
2014-05-27service: Renamed Sync to SyncRequestbunnei1-1/+1
2014-05-27kernel: added enum for known CurrentThread and CurrentProcess handlesbunnei1-0/+5
2014-05-27srv: added a real mutex for GetProcSemaphore (instead of stubbed)bunnei1-3/+10
2014-05-27svc: changed SendSyncRequest to use Kernel::Object SyncRequest (instead of just service Interface class)bunnei1-2/+2
2014-05-27kernel: add a SyncRequest method to KernelObject for use with svcSendSyncRequestbunnei4-6/+11
2014-05-27svc: added stub for DuplicateHandle SVC callbunnei1-1/+8
2014-05-23service: fixed typo that MSVC did not catch as an errorbunnei1-1/+1
2014-05-23core: fixed headers in CMakeListsbunnei1-1/+4
2014-05-23core: added Kernel::Reschedule() call to check for thread changes, shortened delay time to 100 instructionsbunnei1-1/+6
2014-05-23svc: added a check to ensure that a service was implemented before attempting to connect to its portbunnei1-1/+5
2014-05-23lcd: added thread wait after (faked) vblank interrupt (would have) occurredbunnei1-0/+4
2014-05-23thread: renamed "WaitCurThread" to "WaitCurrentThread", removed unused "reason" argumentbunnei3-6/+6
2014-05-23thread: removed unused SwitchContext/Reschedule reason field, added missing arg parameter to SVC CreateThreadbunnei3-12/+9
2014-05-23kernel: refactored function naming to remove "__" prefixbunnei6-65/+75
2014-05-23core: moved armcopro.cpp to correct filter folder (arm/interpreter)bunnei1-3/+3
2014-05-23thread: moved ThreadStatus/WaitType to header, added support for arg on CreateThread, added correct CPSR resetbunnei2-35/+40
2014-05-23APT_U: added a debug log on calling GetLockHandlebunnei1-0/+1
2014-05-23arm_interpreter: fixed load context to currently resume a threadbunnei1-1/+4
2014-05-22thread: fixed bug where result of __NextThread was not being properly checked when NULLbunnei1-1/+1
2014-05-22svc: added Kernel::Reschedule to svc WaitSynchronization1, updated log messages to include newly created handlesbunnei1-4/+7
2014-05-21svc: enabled use of newly created kernel thread handlebunnei1-5/+5
2014-05-21mutex: refactored the interface to code to return a Mutex* handlebunnei4-5/+16
2014-05-21mutex: initial commit of HLE modulebunnei7-10/+166
2014-05-21svc: added some commentsbunnei1-0/+7
2014-05-21kernel: fixed include, in general include "common.h" not "common_types.h"bunnei1-1/+1
2014-05-21service: removed redundant include of common_types.hbunnei1-1/+0
2014-05-21arm: removed include of windows.h from armdefs.h to arminit.c (only module that uses it)bunnei2-4/+3
2014-05-21armemu: missed rename of "Syscall" to "SVC"bunnei1-1/+1
2014-05-21thread: added correct lowest thread priority, added a thread priority check, and added some commentsbunnei2-6/+10
2014-05-21thread: exposed ResumeThreadFromWait function for use in other kernel modulesbunnei2-8/+11
2014-05-21thread: moved threading calls to the Kernel namespacebunnei4-103/+117
2014-05-21ARM_Interpreter/ARM_Interface: Fixed member variable naming to be consistent with style guidebunnei3-45/+45
2014-05-21ARM_Interface: added SaveContext and LoadContext functions for HLE thread switchingbunnei4-37/+65
2014-05-21renamed "syscall" module to "svc" (more accurate naming)bunnei9-26/+28
2014-05-21thread: whitespace change - fixed * and & placementbunnei2-27/+27
2014-05-21- created a Kernel namespacebunnei6-75/+87
- cleaned up Kernel code a bit (moved stuff into namespace, fixed whitespace issues) - added handle types for all different CTROS handles
2014-05-20apt: changed stubbed handle to be something other than 0xDEADBEEF (used as a magic value in other places) so that I can track how it propagates through the app codebunnei1-1/+1
2014-05-20thread: added declaration for __KernelReschedule to be used by syscall modulebunnei1-0/+3
2014-05-20VFP: disable DBG messages because they spam the console with unimportant skyeye junkbunnei1-1/+1
2014-05-20CMakeLists: rename HEADS, improved commentsarchshift1-2/+2
Changes for clarity of comments, removed redundant compiler flags.
2014-05-19renamed "session" to "handle"bunnei1-3/+3
2014-05-19- renamed NewHandle to CreateHandlebunnei2-8/+8
- updated CreateHandle/DeleteHandle to use KernelObject's
2014-05-19fix warningbunnei1-1/+1
2014-05-19- updated service(s) to be KernelObject'sbunnei7-59/+31
- various cleanups
2014-05-19renamed "UID" to "Handle" where appropriatebunnei4-24/+22
2014-05-19- moved Handle/Result definitions to kernel.hbunnei6-14/+19
- added ResetType enum
2014-05-18- added stub for CreateEventbunnei1-8/+22
- changed some stubbed SVCs to return unique handle names for debugging purposes
2014-05-18added stubbed function for WaitSynchronizationNbunnei2-4/+19
2014-05-17Fixed vfp issuesarchshift4-10/+10
2014-05-17ignore thumbemu 0xDEADCODE debugging catch on MCRbunnei1-2/+1
2014-05-17changed a commentbunnei2-2/+2
2014-05-17cleanups to SVC CreateThreadbunnei1-8/+15
2014-05-17updated how we call ARM core to make things much fasterbunnei6-23/+36
2014-05-17Updated cmakelistsarchshift1-6/+12
2014-05-17- added enum ThreadProcessorIdbunnei2-53/+107
- reorganized some kernel thread functions - added placeholder __KernelWaitThread_Synchronization function
2014-05-17- replaced KERNELOBJECT_MAX_NAME_LENGTH with KERNEL_MAX_NAME_LENGTHbunnei3-8/+12
- added KERNEL_DEFAULT_STACK_SIZE definition (0x4000)
2014-05-17added stubbed GetProcSemaphore - does nothing but avoids an exceptionbunnei1-1/+7
2014-05-17add kernel.* and thread.* to VS filtersbunnei1-0/+15
2014-05-17updated APT_U::GetLockHandle to return a valid handlebunnei1-1/+5
2014-05-17same fix as last commit - just for vfpsingle.cppbunnei1-2/+2
2014-05-17another VFP fix for GCCbunnei1-2/+2
2014-05-17fixed VFP DBG log for GCCbunnei1-1/+1
2014-05-17fixed typo in CMakeLists.txtbunnei1-1/+1
2014-05-17- reenabled MCR and MRC functions now that VFP is attachedbunnei4-116/+94
- removed HLE::CallMCR function (was pointless)
2014-05-17- removed unused stubbed out codebunnei5-33/+27
- fixed some compiler issues with xscale_copro when porting code to Windows - fixed some #include's
2014-05-16added maverick.cpp to ARM core from skyeyebunnei4-1/+1212
2014-05-16fixed includesbunnei1-2/+2
2014-05-16enabled CP_ACCESS_ALLOWEDbunnei1-6/+4
2014-05-16fixed include pathbunnei1-1/+1
2014-05-16removed undefined function ARMul_ConsolePrintbunnei1-1/+1
2014-05-16added missing armcopro from skyeyebunnei6-251/+1098
2014-05-16added missing skyeye mmu codebunnei12-44/+3333
2014-05-16fixed armmmu importsbunnei1-5/+5
2014-05-16- moved mmu to arm/interpreter folderbunnei16-1/+8791
- added initial VFP code from skyeye
2014-05-16- added SVC stubs for QueryMemory and GetThreadIdbunnei3-2/+30
- added SVC structs MemoryInfo and PageInfo
2014-05-16added memory mapped region for system mem - sdk demos load a segment here on ELF loadbunnei3-1/+23
2014-05-16added ability to load AXF files (same as ELF)bunnei1-0/+3
2014-05-16completely gutted/refactored threading code to be simplerbunnei2-658/+230
2014-05-16changed "UID" to "Handle" to be a little more consistent with CTR namingbunnei2-18/+21
2014-05-16- added ThreadContext structbunnei2-8/+26
- cleaned up CreateThread svc
2014-05-15- added helper function for __KernelCreateThreadbunnei2-4/+76
- added __KernelSwitchToThread for enabling a thread - added __KernelRotateThreadReadyQueue
2014-05-15changed primary thread priority to 0x30 - this is typical, not 0x31bunnei1-1/+2
2014-05-15added function stubs for EatCycles and ReSchedulebunnei2-0/+15
2014-05-14fixed thread reset to not set stack addressbunnei1-1/+1
2014-05-14various cleanups / remove unused codebunnei2-65/+29
2014-05-14added a bunch of threading code, recycled from PPSSPP, with lots of hacks in for 3DS... doesn't really do much yet. Just a jumping off pointbunnei2-70/+543
2014-05-14changed loader to use __KernelLoadExecbunnei1-8/+9
2014-05-14added CreateThread, CreateMutex, and ReleaseMutex SVC stubs (just parameter decoding for now)bunnei2-7/+38
2014-05-14- added __KernelLoadExec functionbunnei2-13/+35
- fixed some logging
2014-05-12added option to set CPSR register to arm_interfacebunnei3-0/+20
2014-05-10added initial kernel/thread modulesbunnei7-0/+548
2014-05-08removed unknown fields from GX_CmdBufferHeaderbunnei1-5/+0
2014-05-08removed unnecessary log messagebunnei1-1/+1
2014-05-08- removed HLE mem "hack" and replaced with kernel mem regionbunnei8-116/+100
- added a helper function for getting command buffer for services - fixed bug where GSP DMA was incorrectly being done in DataSynchronizationBarrier (instead of gsp_TriggerCmdReqQueue)
2014-05-08added kernel memory to mem_mapbunnei2-0/+9
2014-05-07- added debug logging to syscall.cppbunnei2-135/+173
- added stubbed HLE syscall functions for svc_GetResourceLimit and svc_GetResourceLimitCurrentValues
2014-05-07added mem_map read for config_membunnei2-7/+17
2014-05-07added config_mem module for HLE of firmware configuration memory settingsbunnei5-0/+100
2014-05-07- disable strict alignment on LDRD/STRDbunnei1-17/+22
- handle RD in STREX/STREXB
2014-05-06commented out useless debug logs that just spammed consolebunnei1-3/+3
2014-05-02- added CallMCR function to coprocessor HLE modulebunnei3-29/+43
- moved instruction decoding to coprocessor HLE module
2014-05-02fixed include in coprocessor.cppbunnei1-1/+1
2014-05-02renamed hle "mrc" module to "coprocessor"bunnei6-17/+17
2014-05-02- added some function wrappers for HLEbunnei2-10/+29
- added stub for SVC CreateAddressArbiter - added OutputDebugString SVC
2014-05-01- added option to load a code.bin file extracted from a CXI filebunnei2-14/+63
- updated load launcher.dat function to use ARM11 format hack
2014-05-01added a module to load symbol map files for debuggingbunnei5-0/+55
2014-05-01fixed a bug where ExeFs code was being incorrectly maskedbunnei1-1/+1
2014-05-01Fixed indentsarchshift1-2/+2
2014-05-01A bit of Cmake lovearchshift1-1/+38
2014-05-01added virtual memory map for ExeFS (where ARM11 code is supposed to be loaded)bunnei3-1/+17
2014-05-01reorganized memory regions enum, added regions for ExeFS codebunnei2-21/+26
2014-04-28Problematic template functionsarchshift1-15/+0
2014-04-28added virtual address conversion for firmware FW0Bbunnei2-5/+11
2014-04-28removed DISALLOW_COPY_AND_ASSIGN in favor of NonCopyable classbunnei5-12/+1
2014-04-28fixed weird spacingbunnei1-1/+1
2014-04-28removed commented out line - this was for an unimplemented MRC call, no longer need to leave this herebunnei1-1/+0
2014-04-27hackish but working way to set the framebuffer location to VRAM (used in ARM11 demos tested thus far, e.g. yeti3DS)bunnei1-3/+9
2014-04-27added helper functions to mem_map to convert physical addresses to virtual addressesbunnei2-1/+15
2014-04-27added code to LCD modules keep track of framebuffer location in FCRAM or VRAMbunnei2-15/+153
2014-04-26- changed HW IO map to use virtual addressesbunnei4-42/+64
- added hooks to catch LCD IO read/writes
2014-04-26added simple GSP GPU ReadHWRegs function to support returning the framebuffer addressbunnei1-1/+37
2014-04-26added preliminary DataSynchronizationBarrier support with simple DMA copybunnei1-7/+39
2014-04-26added (fake) physical addresses for where to put framebuffer in VRAMbunnei1-0/+10
2014-04-26added vram to memory_mapbunnei2-8/+15
2014-04-25moved HLE::MRC to its own module, added support for catching data synchronization barrier commandbunnei9-13/+66
2014-04-25added disassembly to unimplemented instructionbunnei1-1/+6
2014-04-25removed some cruftbunnei1-7/+1
2014-04-25fixed bug where svc_ControlMemory was not properly getting passed in parametersbunnei1-2/+2
2014-04-25- added preliminary support for svc_MapMemoryBlockbunnei4-14/+70
- added shared memory region - moarrrr cleanups to memory_map
2014-04-25added functions to map Heap and Shared memory spacebunnei3-9/+76
2014-04-25added GSP::RegisterInterruptRelayQueue functionbunnei1-31/+40
2014-04-25- refactored how service functions are calledbunnei5-19/+39
- added option to create/delete service handles
2014-04-23fixes to build on linuxbunnei3-22/+24
2014-04-23updated CMakeLists for missing filesShizZy1-1/+9
2014-04-22Add a quick way to load Launcher.dat filesMathieu Vaillancourt2-5/+60
2014-04-18renamed hw_lcd module to just lcdbunnei6-12/+10
2014-04-18added NDMA hardware interfacebunnei5-2/+141
2014-04-18added GSP heap memory allocationbunnei3-1/+76
2014-04-18fixed bug in Memory::GetPointerbunnei1-2/+2
2014-04-18moved enums into Memory:: namespacebunnei1-4/+2
2014-04-18added memory read/write to GSP heapbunnei3-7/+16
2014-04-18more various refactors to memory interfacebunnei3-48/+58
2014-04-18cleaned up memory interfaces a lot, removed some hackish stuffbunnei3-106/+50
2014-04-17added a new function wrapperbunnei1-0/+5
2014-04-17fixed bug with printing std::string in log messagesbunnei1-2/+2
2014-04-17changed unknown memory read/write to report the sizebunnei1-2/+3
2014-04-17added class stub for HID:User servicebunnei5-0/+80
2014-04-17updated service commentsbunnei6-5/+17
2014-04-17- fixed tabs in function_wrappers.hbunnei4-395/+413
- fixed log message wording in hle.cpp - added syscall stubs for CloseHandle and WaitSynchronization1
2014-04-16- added stubbed out GSP::Gpu service interfacebunnei9-7/+111
- various cleanups/refactors to HLE services
2014-04-16removed no longer used function headerbunnei1-2/+0
2014-04-16restructured hle:services completely to use function lookup tablesbunnei5-137/+215
2014-04-16fixed naming for APT_Ubunnei3-9/+9
2014-04-16- extracted srv: calls from service.cpp and put in its own modulebunnei6-106/+113
- added function tables for service calls - lots of refactoring
2014-04-14added a stub for GetLockHandlebunnei3-9/+44
2014-04-13added framework for APT service (application and title launching service)bunnei7-5/+126
2014-04-13renamed class Interface_SRV to SRVbunnei1-6/+6
2014-04-13replace tabs with spacesbunnei1-3/+3
2014-04-13added some very initial command parsing for SRV Syncbunnei1-5/+31
2014-04-13added a GetPointer function for reading from HLE command bufferbunnei2-0/+14
2014-04-13fixed hw write declarations to not be constbunnei1-4/+4
2014-04-13added OS memory read/write for thread command bufferbunnei4-12/+60
2014-04-13cleanups to service HLEbunnei2-8/+8
2014-04-13- added HLE to connect to "srv:" servicebunnei11-168/+386
- added a manager for keeping track of services/ports - added a memory mapped region for memory accessed by HLE - added HLE for GetThreadCommandBuffer function
2014-04-13Implement simple LoadSymbols for ELF filesMathieu Vaillancourt1-63/+13
2014-04-12hacked CPU interpreter to ignore branch on SVC instruction (as we are HLEing this...)bunnei1-2/+6
2014-04-12added a SETABORT method that does not update LR (for HLE'd SVC that does not jump appcore CPU to an IRQ vector)bunnei1-0/+11
2014-04-12added a memory mapped option for HLEbunnei1-5/+8
2014-04-12- renamed hle_syscall to just syscallbunnei7-106/+157
- added service.h as an initial service interface
2014-04-12replace tabs with spacesbunnei1-6/+6
2014-04-12moved hle.cpp into hle folder (due to mistake earlier)bunnei3-2/+2
2014-04-11added remaining known syscall functions to Syscall_Tablebunnei1-0/+80
2014-04-11base code to call a syscall from ARM11 appcorebunnei5-9/+85
2014-04-11updated logging messagebunnei1-2/+2
2014-04-11cleaned up some logging messagesbunnei5-32/+19
2014-04-11changed some naming/misc cleanupsbunnei4-21/+20
2014-04-11- removed syscall classes (will just use HLEFunction)bunnei6-15/+54
- added hle.cpp and module registration - removed unused code
2014-04-11added initial modules for setting up SysCall HLEbunnei7-0/+862
2014-04-11missed this file with commit 95e5436fbunnei1-1/+10
2014-04-11added Memory::GetCharPointer to read strings from HLE functionsbunnei1-0/+4
2014-04-11cleaned up arm_interface, added a setter to set registers for use with HLE return valuesbunnei2-6/+70
2014-04-10fixed a bunch of errors in CMakeListsbunnei1-1/+1
2014-04-10updated CMakeListsbunnei1-8/+21
2014-04-09fixed licensing and updated code style naming for arm_interface/arm_interpreter frontend modulebunnei3-94/+57
2014-04-09fixed project includes to use new directory structurebunnei34-251/+255
2014-04-09got rid of 'src' folders in each sub-projectbunnei48-0/+0
2014-04-09fixed some license headers that I missedbunnei2-46/+6
2014-04-09fixed all license file headers in corebunnei12-303/+44
2014-04-09fixed licensing issue with core_timing being GPL v2+ instead of Dolphin's GPL v2bunnei2-487/+455
2014-04-07removed log message from hw_lcdbunnei1-2/+0
2014-04-07added hack physical memory reads with Memory::GetPointerbunnei1-2/+9
2014-04-06calling SwapBuffers from hw_lcd.cppbunnei1-0/+2
2014-04-06initialize VideoCorebunnei1-2/+3
2014-04-05added g_app_core->Step and HW::Update to Core::SingleStep to be consistent with other changes madebunnei1-1/+5
2014-04-05changed hw_lcd to use ARM core correct tick counter instead of [what was actually] just an instruction count. this seems to fix timing issues with the 3DS_Homebrew_Pong3Dv2 demo.bunnei3-8/+48
2014-04-05add hw_lcd.* to VS project filesbunnei2-0/+8
2014-04-05added an "Update" method to update all hardwarebunnei2-0/+10
2014-04-05added a module for interfacing to hardware LCDbunnei2-0/+129
2014-04-05added a tick counterbunnei1-4/+12
2014-04-05added initial support for hw.cpp modulebunnei8-52/+69
2014-04-05Remove Core::GetState(). Use new ARM_Interface instead.Mathieu Vaillancourt1-2/+0
2014-04-05added hw module to interface h/w register reads/writesbunnei5-3/+118
2014-04-05renamed some functionsbunnei1-11/+11
2014-04-05added entry point loading from ELF filebunnei1-2/+4
2014-04-05- added an interface layer for ARM coresbunnei7-77/+213
- cleaned up core.cpp a bit
2014-04-05renamed ARM disassembler class from "Arm" to "ARM_Disasm"bunnei2-27/+27
2014-04-05got rid of some really poorly named macros in SkyEye corebunnei3-9/+9
2014-04-05moved arm core to interpreter directorybunnei17-65/+71
2014-04-04added some commented out ARMulator functionsbunnei1-20/+3
2014-04-04added hack to allow physical mem read/writesbunnei1-2/+20
2014-04-04made memory #define's enum to make debugging easierbunnei1-15/+21
2014-04-04Add Core::GetState() for debuggerMathieu Vaillancourt2-0/+9
2014-04-04removed some useless log messagesbunnei1-2/+0
2014-04-04added thumb mode emulationbunnei6-4/+522
2014-04-02convert tabs to spacesbunnei10-6796/+6796
2014-04-02-converted tabs to spacesbunnei2-149/+145
-moved scratchpad memory out of MemArena
2014-04-01added very hackish ARMulator core initialization and CPU steppingbunnei1-6/+97
2014-04-01added ELF loading support to loader.cppbunnei1-69/+113
2014-04-01commented out bswap stuff... ARM ELF files are little endian anywaybunnei1-9/+10
2014-04-01added support for reading/writing to stack membunnei3-17/+40
2014-03-30replaced some error logs with debug assertsbunnei1-4/+2
2014-03-30removed unnecessary debug assertbunnei1-1/+0
2014-03-30added ARM11 MMU from skyeyebunnei6-145/+116
2014-03-30initialize mem regionsbunnei1-0/+2
2014-03-30added various arm modules from skyeye to make project link OKbunnei9-166/+2582
2014-03-25added a GetPointer function to Memory for use with ELF loadingbunnei3-30/+33
2014-03-25updated Windows project files to include ELF filesbunnei2-0/+7
2014-03-25added Dolphin's ELF reader to the projectbunnei3-0/+594
2013-10-06renamed FILETYPE_CTR_DIRECTORY to FILETYPE_DIRECTORY_CXIShizZy2-12/+10
2013-10-06fixed a typo in declaration of meta file systemShizZy1-2/+2
2013-10-03moved some core functions over to system moduleShizZy4-13/+11
2013-10-02added core_timing and system modules to core vcprojShizZy6-2/+823
2013-10-02added an early function for booting from a directoryShizZy2-16/+35
2013-10-02added a message option to Core::Halt functionShizZy2-2/+2
2013-09-27upgraded proj files to vs 2013ShizZy1-1/+5
2013-09-27added system.h to projectShizZy5-22/+87
2013-09-26added meta_file_system to projectShizZy4-0/+637
2013-09-26renamed file_sys_directory.* to directory_file_system.*ShizZy4-5/+5
2013-09-26moved file_sys back to coreShizZy5-0/+982
2013-09-24removed <windows.h> include from common.h and added it only where neededShizZy1-0/+4
2013-09-24moved file_sys to commonShizZy5-982/+0
2013-09-24removed unused commented-out codeShizZy1-154/+0
2013-09-24renamed PSPFileInfo to just FileInfoShizZy3-21/+21
2013-09-24added PPSSPP's file system directory module for game loadingShizZy3-10/+138
2013-09-20ppsspp file system module - currently unusedShizZy3-0/+1008
2013-09-20added a module for loading bootable binariesShizZy4-0/+203
2013-09-20added mem_map hardware writingShizZy3-75/+76
2013-09-19added hw R/W/ memory functionsShizZy5-3/+161
2013-09-19refactored some mem_map stuffShizZy2-19/+36
2013-09-19added log msg to coreShizZy1-0/+2
2013-09-18added ARMulator/skyeye ARM11 core to the projectShizZy18-0/+11356
2013-09-14renamed project to 'citrus'ShizZy4-4/+4
2013-09-09cleaned up VS project filesShizZy1-52/+7
2013-09-08updated common pathsShizZy1-0/+2
2013-09-06start of 3DS memory mapShizZy2-4/+77
2013-09-06added core and mem_map files to the projectShizZy6-2/+232
2013-09-05added an ARM disassembler from the android projectShizZy4-0/+1175
2013-09-05added missing filesShizZy1-0/+2
2013-09-05various fixes to be able to build projectShizZy1-16/+19
2013-08-30adding initial project layoutShizZy2-0/+196