summaryrefslogtreecommitdiffstats
path: root/src/core/hle/svc.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Sources: Run clang-format on everything.Emmanuel Gil Peyrot2016-09-181-234/+278
|
* Kernel/SVC: Implemented svcCreatePort.Subv2016-06-111-1/+20
|
* SVC::WaitSynchronizationN: Reschedule at the endwwylele2016-05-211-2/+3
|
* Set fpscr for new threadsJannik Vogel2016-05-171-0/+3
|
* Kernel: Implemented shared memory permissions.Subv2016-05-131-0/+2
|
* Kernel/SharedMemory: Properly implemented shared memory support.Subv2016-05-131-12/+35
| | | | | | | Applications can request the kernel to allocate a piece of the linear heap for them when creating a shared memory object. Shared memory areas are now properly mapped into the target processes when calling svcMapMemoryBlock. Removed the APT Shared Font hack as it is no longer needed.
* Merge pull request #1766 from Subv/log_cpubunnei2016-05-081-0/+5
|\ | | | | Kernel/Threading: Warn when a thread can be scheduled in the Syscore (Core 1)
| * Kernel/Threading: Warn when a thread can be scheduled in the Syscore (Core 1).Subv2016-05-071-0/+5
| | | | | | | | We do not currently implement any cores other than the AppCore (Core 0).
* | Merge pull request #1647 from mailwl/acu-closeasyncbunnei2016-04-301-0/+4
|\ \ | | | | | | ac:u: stub CloseAsync; align memory size in svc:GetProcessInfo(type=2)
| * | ac:u: stub CloseAsync; check memory size aling in svc:GetProcessInfo(type=2)mailwl2016-04-211-0/+4
| |/
* / Common: Remove section measurement from profiler (#1731)Yuri Kunde Schlesner2016-04-291-4/+0
|/ | | | This has been entirely superseded by MicroProfile. The rest of the code can go when a simpler frametime/FPS meter is added to the GUI.
* svc: Move ResetType enum to the kernel event headerLioncash2016-03-131-2/+2
|
* ThreadProcessorId_All on SVC::CreateThreadKloen2016-03-011-0/+1
|
* HLE/SVC: Implement UnmapMemoryBlock.Subv2016-01-141-5/+27
| | | | This implementation will need to be (almost completely) changed when we implement multiprocess support.
* svc: Remove superfluous printf argumentLioncash2015-12-251-1/+1
|
* svc: Fix compilation with LOG_TRACE enabledLioncash2015-12-131-1/+1
|
* Kernel: Implement svcGetSystemInfoYuri Kunde Schlesner2015-12-011-1/+46
| | | | | This makes smealum/ctrulib@b96dd51d3349961189d4ab1bc2a5c45deff21c09 work with Citra.
* SVC: Advance time when calling GetSystemTick to escape busy-wait loopsYuri Kunde Schlesner2015-08-301-1/+4
| | | | | | | | Cubic Ninja waited for the frame to end by spinning on a loop calling GetSystemTick while doing nothing else. Since GetSystemTick doesn't cause a reschedule (which advances time), this meant that very little emulated time would pass inside that loop, causing the game to spend most of the frame burning away CPU.
* Integrate the MicroProfile profiling libraryYuri Kunde Schlesner2015-08-251-0/+4
| | | | | This brings goodies such as a configurable user interface and multi-threaded timeline view.
* Kernel: Implement svcGetProcessInfo in a basic wayYuri Kunde Schlesner2015-08-161-1/+47
| | | | | This also adds some basic memory usage accounting. These two types are used by Super Smash Bros. during startup.
* Kernel: Add more infrastructure to support different memory layoutsYuri Kunde Schlesner2015-08-161-1/+1
| | | | | | This adds some structures necessary to support multiple memory regions in the future. It also adds support for different system memory types and the new linear heap mapping at 0x30000000.
* Move core/mem_map.{cpp,h} => core/hle/kernel/memory.{cpp,h}Yuri Kunde Schlesner2015-08-161-1/+1
|
* Kernel: Properly implement ControlMemory FREE and COMMITYuri Kunde Schlesner2015-08-161-13/+95
|
* Merge pull request #888 from zawata/Warning-Fixes-2Yuri Kunde Schlesner2015-07-251-2/+2
|\ | | | | Core\HLE : Fix Warning
| * Core\HLE : Fix Warningzawata2015-07-171-2/+2
| | | | | | | | "signed/unsigned mismatch"
* | dyncom: Pass SVC immediates directly.Lioncash2015-07-211-4/+3
| | | | | | | | Previously it would just re-read the already decoded instruction and extract the immediate value.
* | Kernel/SVC: Implemented svcQueryProcessMemorySubv2015-07-171-6/+16
| |
* | Kernel/SVC: Implemented svcQueryMemory.Subv2015-07-171-2/+14
|/
* kernel: Fix svcWaitSynch to always acquire requested wait objects.bunnei2015-06-171-9/+17
|
* Remove every trailing whitespace from the project (but externals).Emmanuel Gil Peyrot2015-05-291-2/+2
|
* Core/SVC: Map the shared memory created in CreateMemoryBlock to the specified address.Subv2015-05-251-0/+2
| | | | This SharedMemory can be passed to service functions (Which should map the memory into their own address space).
* Kernel: Move reschedules from SVCs to actual mechanisms that reschedule.bunnei2015-05-211-20/+2
|
* Implement svcBreakarchshift2015-05-171-1/+13
|
* Core/ResourceLimits: Implemented the basic structure of ResourceLimits.Subv2015-05-151-11/+38
| | | | | | Implemented svcs GetResourceLimit, GetResourceLimitCurrentValues and GetResourceLimitLimitValues. Note that the resource limits do not currently keep track of used objects, since we have no way to distinguish between an object created by the application, and an object created by some HLE module once we're inside Kernel::T::Create.
* Memmap: Re-organize memory function in two filesYuri Kunde Schlesner2015-05-151-1/+1
| | | | | | | memory.cpp/h contains definitions related to acessing memory and configuring the address space mem_map.cpp/h contains higher-level definitions related to configuring the address space accoording to the kernel and allocating memory.
* fixup!Subv2015-05-121-9/+9
|
* Core/HLE: Implemented the SVCs GetProcessId and GetProcessIdOfThreadSubv2015-05-111-2/+31
|
* Kernel: Capture SharedMemory attributes at creation, not when mappingYuri Kunde Schlesner2015-05-111-1/+3
|
* Fix printf format warningYuri Kunde Schlesner2015-05-071-1/+1
|
* Common: Remove common.hYuri Kunde Schlesner2015-05-071-0/+1
|
* HLE: Clean up SVC dispatch mechanismYuri Kunde Schlesner2015-05-061-3/+34
|
* SVC: Assert on unsupported CreateThread processor ID.bunnei2015-04-101-3/+9
|
* SVC: Update various SVCs to cause a reschedule.bunnei2015-04-101-2/+22
| | | | - CreateMutex/ReleaseMutex/ReleaseSemaphore/SetTimer/CancelTimer/ArbitrateAddress
* Thread: Implement priority boost for starved threads.bunnei2015-04-101-6/+16
| | | | | | SVC: Return correct error code on invalid CreateThread processor ID. SVC: Assert when creating a thread with an invalid userland priority.
* SVC: Reschedule on svcCreateThread.bunnei2015-04-101-0/+2
|
* arm_interface: Get rid of GetTicks.Lioncash2015-03-161-2/+3
| | | | Removes a TODO.
* Asserts: break/crash program, fit to style guide; log.h->assert.harchshift2015-02-111-1/+1
| | | | | | | Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time) As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing) Also removed some GEKKO cruft.
* Scheduler refactor Pt. 1Kevin Hartman2015-02-101-5/+9
| | | | | | | | | | | | | * Simplifies scheduling logic, specifically regarding thread status. It should be much clearer which statuses are valid for a thread at any given point in the system. * Removes dead code from thread.cpp. * Moves the implementation of resetting a ThreadContext to the corresponding core's implementation. Other changes: * Fixed comments in arm interfaces. * Updated comments in thread.cpp * Removed confusing, useless, functions like MakeReady() and ChangeStatus() from thread.cpp. * Removed stack_size from Thread. In the CTR kernel, the thread's stack would be allocated before thread creation.
* WaitSynch: Always reschedule (verified behavior on hw).bunnei2015-02-101-4/+4
|
* Kernel: Stop creating useless Handles during object creationYuri Kunde Schlesner2015-02-021-7/+11
| | | | | They're finally unnecessary, and will stop cluttering the application's handle table.
* SVC: Enable CloseHandle, clean up DuplicateHandleYuri Kunde Schlesner2015-02-021-9/+5
|
* Thread: Modernize two functions that slipped through previous rebasesYuri Kunde Schlesner2015-02-021-3/+3
|
* Make Port/Service registration and querying more HW-accurateYuri Kunde Schlesner2015-02-021-4/+16
|
* SVC: Use CASCADE_RESULT in SVC handlersYuri Kunde Schlesner2015-01-301-73/+32
|
* Remove result.h InvalidHandleYuri Kunde Schlesner2015-01-301-15/+16
| | | | | It was only being used in two places, where it was replaced by a local constant.
* SVC: Change return type of handlers to ResultCodeYuri Kunde Schlesner2015-01-301-90/+90
|
* Kernel: Convert Event to not use HandlesYuri Kunde Schlesner2015-01-301-11/+29
|
* Kernel: Convert Timer to (mostly) not use HandlesYuri Kunde Schlesner2015-01-301-7/+40
|
* Kernel: Convert Mutex to not use HandlesYuri Kunde Schlesner2015-01-301-5/+19
|
* Kernel: Convert AddressArbiter to not use HandlesYuri Kunde Schlesner2015-01-301-6/+24
|
* Kernel: Convert Semaphore to not use HandlesYuri Kunde Schlesner2015-01-301-6/+27
|
* Kernel: Convert SharedMemory to not use HandlesYuri Kunde Schlesner2015-01-301-15/+29
|
* Merge pull request #412 from purpasmart96/svc_table_cleanupbunnei2015-01-281-7/+7
|\ | | | | SVC: Update the SVC function table
| * SVC: Update the SVC function tablepurpasmart962015-01-271-7/+7
| |
* | WaitSynchronization: Added a result code for invalid result, fixed bug.bunnei2015-01-221-3/+9
| |
* | Thread: Fix WaitSynchronization1 to not set register 1 on thread wakeup.bunnei2015-01-221-3/+3
| |
* | Kernel: Changed "ShouldWait" to return bool and "Acquire" to return void.bunnei2015-01-221-7/+3
| |
* | WaitObject: Renamed "Wait" to "ShouldWait", made "ShouldWait" and "Acquire" pure virtual.bunnei2015-01-221-2/+2
| |
* | Kernel: Reschedule on SignalEvent and SendSyncRequest, fix some bugs.bunnei2015-01-221-0/+1
| |
* | Kernel: Moved Wait and Acquire to WaitObject, added way to retrieve a WaitObject safely.bunnei2015-01-221-2/+2
| |
* | SVC: Removed a Sleep that made no sensebunnei2015-01-221-6/+1
| | | | | | | | | | - Would deadlock the calling thread - Code would never get hit anyways
* | AddressArbiter: Changed to Kernel::Object, big cleanup, removed code that made no sense.bunnei2015-01-221-3/+3
| |
* | Kernel: Get rid of WaitTypes and simplify lots of code, removing hacks.bunnei2015-01-221-10/+20
| |
* | WaitSynchronizationN: Improved commentsbunnei2015-01-221-7/+12
| |
* | WaitSynchronizationN: Refactor to fix several bugsbunnei2015-01-221-25/+27
| | | | | | | | | | | | - Separate wait checking from waiting the current thread - Resume thread when wait_all=true only if all objects are available at once - Set output to correct wait object index when there are duplicate handles
* | Kernel: Separate WaitSynchronization into Wait and Acquire methods.bunnei2015-01-221-4/+5
| |
* | WaitSynchronizationN: Handle case where handles=nullptr.bunnei2015-01-221-0/+4
| |
* | WaitSynchronizationN: Handle case where handle_count is invalid.bunnei2015-01-221-3/+7
| |
* | WaitSynchronizationN: Handle case where handle_count=0.bunnei2015-01-221-19/+29
| |
* | WaitSynchronizationN: Implement return valuesbunnei2015-01-221-27/+50
| |
* | AddrArbiter: Implement arbitration types 3 and 4.Subv2015-01-131-1/+1
|/
* SVC: Wake up the thread after the delay in WaitSync1Subv2015-01-111-3/+2
|
* Logging: Log all called service functions (under trace). Compile out all trace logs under release for performance.archshift2015-01-101-1/+0
|
* Kernel: Start using boost::intrusive_ptr for lifetime managementYuri Kunde Schlesner2015-01-091-13/+18
|
* Merge pull request #444 from yuriks/handle-reform2bunnei2015-01-091-20/+32
|\ | | | | Kernel Lifetime Reform Pt. 2
| * Thread: Reduce use of Handles and move some funcs to inside the class.Yuri Kunde Schlesner2015-01-091-20/+31
| |
| * Move ThreadContext to core/core.h and deal with the falloutYuri Kunde Schlesner2015-01-091-0/+1
| |
* | Merge pull request #436 from kevinhartman/system-corebunnei2015-01-091-0/+5
|\ \ | |/ |/| Warn if a new thread is intended to be run on the system CPU core
| * Warn if a new thread is intended to be run on the system CPU core until we implement correct scheduling for such a thread.Kevin Hartman2015-01-071-0/+5
| |
* | Merge pull request #255 from Subv/cbranch_3bunnei2015-01-091-4/+32
|\ \ | | | | | | Implemented timers
| * | SVC: Implemented the Timer service calls.Subv2015-01-091-4/+32
| |/
* / SVC: Fixed SleepThread.Subv2015-01-091-0/+4
|/ | | | It will now properly wait the specified number of nanoseconds and then wake up the thread.
* SOC_U: Preliminary implementation of sockets.Subv2014-12-311-1/+13
| | | | | | | | | | | | | Stubbed CreateMemoryBlock Using Berkeley sockets, and Winsock2.2 on Windows. So far ftpony creates the socket and accepts incoming connections SOC_U: Renamed functions to maintain consistency Also prevents possible scope errors / conflicts with the actual Berkeley socket functions SOCU: Close all the opened sockets when cleaning up SOCU
* Kernel: New handle managerYuri Kunde Schlesner2014-12-281-19/+9
| | | | | | | | | | | This handle manager more closely mirrors the behaviour of the CTR-OS one. In addition object ref-counts and support for DuplicateHandle have been added. Note that support for DuplicateHandle is still experimental, since parts of the kernel still use Handles internally, which will likely cause troubles if two different handles to the same object are used to e.g. wait on a synchronization primitive.
* Rename ObjectPool to HandleTableYuri Kunde Schlesner2014-12-281-5/+5
|
* Merge pull request #291 from purpasmart96/licensebunnei2014-12-211-1/+1
|\ | | | | License change
| * License changepurpasmart962014-12-211-1/+1
| |
* | Thread: Wait current thread on svc_SleepThreadbunnei2014-12-211-1/+2
|/ | | | | | - Removed unused VBLANK sleep mode - Added error log for bad context switch - Renamed VerifyWait to CheckWaitType to be more clear
* Merge pull request #185 from purpasmart96/mem_permbunnei2014-12-181-0/+4
|\ | | | | Kernel: Add missing permissions
| * Kernel:Add missing permissions in shared memory & svcpurpasmart962014-11-191-0/+4
| |
* | Remove SyncRequest from K::Object and create a new K::Session typeYuri Kunde Schlesner2014-12-151-7/+4
| | | | | | | | | | | | | | This is a first step at fixing the conceptual insanity that is our handling of service and IPC calls. For now, interfaces still directly derived from Session because we don't have the infrastructure to do it properly. (That is, Processes and scheduling them.)
* | Kernel/Semaphores: Fixed buildSubv2014-12-131-2/+2
| |
* | SVC: Implemented ReleaseSemaphore.Subv2014-12-131-3/+10
| | | | | | | | This behavior was tested on hardware, however i'm still not sure what use the "initial_count" parameter has
* | SVC: Implemented svcCreateSemaphoreSubv2014-12-131-1/+10
| | | | | | | | | | ToDo: Implement svcReleaseSemaphore * Some testing against hardware needed
* | Convert old logging calls to new logging macrosYuri Kunde Schlesner2014-12-131-27/+27
| |
* | MemMap: Renamed "GSP" heap to "linear", as this is not specific to GSP.bunnei2014-12-121-1/+1
| | | | | | | | - Linear simply indicates that the mapped physical address is always MappedVAddr+0x0C000000, thus this memory can be used for hardware devices' DMA (such as the GPU).
* | SVC: Implemented GetThreadId.Subv2014-12-041-4/+5
| | | | | | | | For now threads are using their Handle value as their Id, it should not really cause any problems because Handle values are unique in Citra, but it should be changed. I left a ToDo there because this is not correct behavior as per hardware.
* | SVC: Add debug log to ArbitrateAddress.bunnei2014-11-261-0/+2
| |
* | SVC: SleepThread should yield to the next ready thread.bunnei2014-11-261-0/+3
| |
* | HLE: Revamp error handling throrough the HLE codeYuri Kunde Schlesner2014-11-241-31/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All service calls in the CTR OS return result codes indicating the success or failure of the call. Previous to this commit, Citra's HLE emulation of services and the kernel universally either ignored errors or returned dummy -1 error codes. This commit makes an initial effort to provide an infrastructure for error reporting and propagation which can be use going forward to make HLE calls accurately return errors as the original system. A few parts of the code have been updated to use the new system where applicable. One part of this effort is the definition of the `ResultCode` type, which provides facilities for constructing and parsing error codes in the structured format used by the CTR. The `ResultVal` type builds on `ResultCode` by providing a container for values returned by function that can report errors. It enforces that correct error checking will be done on function returns by preventing the use of the return value if the function returned an error code. Currently this change is mostly internal since errors are still suppressed on the ARM<->HLE border, as a temporary compatibility hack. As functionality is implemented and tested this hack can be eventually removed.
* | Remove trailing spaces in every file but the ones imported from SkyEye, AOSP or generatedEmmanuel Gil Peyrot2014-11-191-14/+14
| |
* | core: Mark some hle functions as staticLioncash2014-11-181-26/+26
|/ | | | These functions are not referred to by their linkage name outside of the translation unit, so they can be marked as static.
* Fix some warningsSean2014-10-301-3/+3
|
* Merge pull request #99 from archshift/ext-checkbunnei2014-09-111-1/+1
|\ | | | | loader.cpp: improved file extension checking, made Upper/LowerStr useful, moved string_util into Common namespace
| * Added string_util to common, small changes in loader.cpparchshift2014-09-091-1/+1
| |
* | core: Prune redundant includesarchshift2014-09-091-3/+0
|/
* Merge pull request #55 from lioncash/stringbunnei2014-08-191-5/+5
|\ | | | | Core: Alter the kernel string functions to use std::string instead of const char*.
| * Core: Alter the kernel string functions to use std::string instead of const char*.Lioncash2014-08-181-5/+5
| | | | | | | | Most functions already operate on std::strings. This also removes the need to manually null terminate thread names.
* | SVC: Added support for svc_GetSystemTick.bunnei2014-08-191-1/+6
|/ | | | Changed HLE function return methods to be static inline functions.
* Core: Fix a formatting error in svc.cppLioncash2014-08-171-3/+2
| | | | | entry_point would not be added to the string. Also used StringFromFormat so that the buffer is unnecessary.
* SVC: Fixed typo with MapMemoryBlock DEBUG_LOG call.bunnei2014-08-081-1/+1
|
* SVC: Removed ArbitrateAddress log message that spams to much.bunnei2014-08-061-2/+0
|
* Kernel: Added preliminary support for address arbiters.bunnei2014-07-091-8/+10
| | | | | | | | AddressArbiter: Added documentation comment, fixed whitespace issue. AddressArbiter: Fixed incorrect comment, reordered if-statement to be more clear. SVC: Removed trailing whitespace.
* SharedMemory: Updated MapSharedMemory to use an enum for permissions.bunnei2014-07-051-10/+9
| | | | - Also added some safety checks to MapSharedMemory.
* GSP: Fixed to use real shared memory object, various cleanups.bunnei2014-07-051-5/+6
| | | | | | | | - 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.
* SVC: Renamed all function wrapper templates to Wrap, moved to HLE namespace.bunnei2014-06-131-126/+126
|
* SVC: Cleaned up function wrappers to pass in correct argument types.bunnei2014-06-131-148/+138
|
* SVC: Moved declaration of "wait" variable in SendSyncRequest for improved readability.bunnei2014-06-131-1/+1
|
* HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)bunnei2014-06-131-107/+107
|
* HLE: Updated various handle debug assertions to be more clear.bunnei2014-06-131-6/+6
|
* Kernel: Added real support for thread and event blockingbunnei2014-06-131-28/+31
| | | | | | | | | | | | | - 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.
* svc: updated WaitSynchronizationN to properly use first pointer argumentbunnei2014-06-021-3/+3
|
* svc: changed DuplicateHandle log message from "error" to "debug"bunnei2014-06-021-1/+1
|
* svc: added GetThreadPriority and SetThreadPriority, added (incomplete) DuplicateHandle supportbunnei2014-06-021-3/+26
|
* kernel: changed main thread priority to default, updated Kernel::Reschedule to use PrepareReschedulebunnei2014-06-021-2/+7
|
* svc: cleaned up function_wrappers, updated various SVCs to make use of pointer argumentsbunnei2014-06-021-16/+18
|
* svc: updated waitSychronization to not overwrite handle on return, added stub for SleepThread (does nothing)bunnei2014-06-011-2/+21
|
* hle: cleaned up log messagesbunnei2014-05-301-27/+28
|
* svc: updated OutputDebugString to use OS_LOGbunnei2014-05-301-1/+1
|
* svc: changed unimplemented SVC log messages from "debug" messages to "error" messagesbunnei2014-05-301-8/+8
|
* svc: added svcClearEvent, stubbed function for svcArbitrateAddress, and various fixesbunnei2014-05-301-22/+32
| | | | | | - force kernel reschedule after svcWaitSynchronization - fixed some bugs with passing in pointer arguments - cleaned up some comments and log messages
* svc: implemented WaitSynchronization1, WaitSynchronizationN, and CreateEventbunnei2014-05-281-14/+54
|
* kernel: updated SyncRequest to take boolean thread wait result as a parameterbunnei2014-05-271-2/+9
|
* svc: added some assertionsbunnei2014-05-271-6/+4
|
* svc: changed SendSyncRequest to use Kernel::Object SyncRequest (instead of just service Interface class)bunnei2014-05-271-2/+2
|
* svc: added stub for DuplicateHandle SVC callbunnei2014-05-271-1/+8
|
* svc: added a check to ensure that a service was implemented before attempting to connect to its portbunnei2014-05-231-1/+5
|
* thread: renamed "WaitCurThread" to "WaitCurrentThread", removed unused "reason" argumentbunnei2014-05-231-2/+2
|
* thread: removed unused SwitchContext/Reschedule reason field, added missing arg parameter to SVC CreateThreadbunnei2014-05-231-8/+5
|
* svc: added Kernel::Reschedule to svc WaitSynchronization1, updated log messages to include newly created handlesbunnei2014-05-221-4/+7
|
* svc: enabled use of newly created kernel thread handlebunnei2014-05-211-5/+5
|
* mutex: refactored the interface to code to return a Mutex* handlebunnei2014-05-211-1/+1
|
* mutex: initial commit of HLE modulebunnei2014-05-211-4/+5
|
* svc: added some commentsbunnei2014-05-211-0/+7
|
* thread: moved threading calls to the Kernel namespacebunnei2014-05-211-2/+2
|
* renamed "syscall" module to "svc" (more accurate naming)bunnei2014-05-211-0/+350