Lioncash
951353558e
gl_state: Remove unnecessary const specifier on Apply
2015-05-23 00:58:32 -04:00
Lioncash
ebca3a4902
y2r_u: Remove unused variable in StartConversion
2015-05-23 00:46:22 -04:00
Lioncash
dc587fa295
video_core/utils: Remove unused variables in GetMortonOffset
2015-05-23 00:38:37 -04:00
Lioncash
1c21354159
Merge pull request #804 from lioncash/dclean
...
dyncom: Remove unused variables and parameters.
2015-05-23 00:09:55 -04:00
Lioncash
92fd2753c5
dyncom: Remove unused cpu parameter from decode_thumb_instr
2015-05-22 23:42:23 -04:00
Lioncash
097d8282a6
dyncom: remove load_r15 from arm_inst
...
It's entirely unused. Also allows getting rid of more clunky macros.
2015-05-22 23:38:00 -04:00
bunnei
a7946f9027
Merge pull request #776 from bunnei/pica-state
...
GPU: Consolidate Pica state
2015-05-22 23:27:41 -04:00
Lioncash
8617938441
dyncom: Remove unnecessary parameter for load/store operations
2015-05-22 23:14:22 -04:00
bunnei
1b42d55a9d
Pica: Create 'State' structure and move state memory there.
2015-05-22 22:59:42 -04:00
bunnei
41531eeb32
Merge pull request #801 from purpasmart96/hid_stubs
...
HID: Stub DisableAccelerometer and DisableGyroscopeLow
2015-05-22 20:44:22 -04:00
Lioncash
23d5df9d9c
gl_state: Fix a condition typo in Apply
2015-05-22 19:49:12 -04:00
Lioncash
932aeb333f
Merge pull request #802 from bunnei/vfp-trace-log
...
VFP: Log as trace to get rid of spamming.
2015-05-22 19:44:22 -04:00
bunnei
3a348a90fd
VFP: Log as trace to get rid of spamming.
2015-05-22 19:42:44 -04:00
purpasmart96
0c62b7b106
HID: Stub DisableAccelerometer and DisableGyroscopeLow
2015-05-22 15:55:27 -07:00
tfarley
62668688e1
Flush for y2r (moflex)
2015-05-22 15:51:34 -07:00
tfarley
16fbba3c2a
MakeCurrent race condition fix
2015-05-22 15:51:33 -07:00
tfarley
05dc633a8c
OpenGL renderer
2015-05-22 15:51:18 -07:00
tfarley
6d995b1ff6
INI hw/sw renderer toggle
2015-05-22 14:37:55 -07:00
Yuri Kunde Schlesner
eca2b71fa8
Merge pull request #798 from yuriks/y2r-bw
...
Service::Y2R: Support for grayscale decoding of specific formats
2015-05-22 14:06:20 -07:00
Yuri Kunde Schlesner
9108482888
Service::Y2R: Support for grayscale decoding of specific formats
...
Implements unrotated planar YUV 4:2:0 -> RGB24 conversions in Y2R.
Currently only the Y (luma) channel is used, so the results don't
contain color. This will be added in a later PR at some point.
This is enough to get all currently know Moflex videos to decode. (Some
don't display on-screen due to seemingly unrelated reasons.)
Thanks to @archshift for doing the initial implementation which I
cleaned up and then fixed the 8x8 block mode.
2015-05-22 17:57:21 -03:00
Lioncash
572c91a024
dyncom: Eliminate clang warnings
...
Gets rid of a whole load of missing brace initialization warnings.
2015-05-21 16:43:21 -04:00
Emmanuel Gil Peyrot
b8f93e6b18
Kernel: Fix a warning introduced with ResourceLimit, and remove the fallback code to prevent it from happening again.
2015-05-21 20:54:49 +02:00
bunnei
25f14e76f1
y2r_u: Stub StartConversion to prevent moflex games from hanging.
2015-05-20 18:05:47 -04:00
bunnei
0b7d2941cf
Kernel: Move reschedules from SVCs to actual mechanisms that reschedule.
2015-05-20 18:05:47 -04:00
bunnei
1c3cda5d7e
Merge pull request #783 from jroweboy/cond-wait
...
Use condition var to properly pause the CPU thread
2015-05-18 18:49:51 -04:00
bunnei
859707642e
Merge pull request #766 from purpasmart96/cfg_service_update
...
CFG: Update the cfg service to be like other integrated services
2015-05-18 10:18:58 -04:00
James Rowe
a406207cd8
Use condition var to properly pause the CPU thread
...
Adds support for threaded pausing so citra doesn't spin wait on pause
2015-05-18 08:15:57 -06:00
bunnei
f0365f28c2
Merge pull request #772 from lioncash/warn
...
core/video_core: Fix a few warnings when compiling on MSVC.
2015-05-18 08:08:49 -04:00
bunnei
1b47da4115
Merge pull request #785 from archshift/break
...
Implement svcBreak
2015-05-18 08:04:22 -04:00
Subv
24d9416930
GPU/DefaultAttributes: Clear up a comment in command_processor
2015-05-17 14:13:11 -05:00
Subv
658c44af5c
GPU/DefaultAttributes: Let the attribute data from the loaders overwrite the default attributes, if set.
...
closes #735
2015-05-17 11:52:17 -05:00
archshift
11057488f9
Implement svcBreak
2015-05-16 22:06:59 -07:00
bunnei
9fb9750411
Merge pull request #781 from archshift/delete
...
Delete unused hle/coprocessor.cpp
2015-05-16 11:16:29 -04:00
bunnei
42c6590349
Merge pull request #778 from purpasmart96/apt_assert_fix
...
APT/FS: Remove asserts that were causing false positives in games
2015-05-16 02:31:22 -04:00
archshift
4b300ba763
Delete unused hle/coprocessor.cpp
2015-05-15 23:24:11 -07:00
Yuri Kunde Schlesner
ba2fe7f795
Merge pull request #758 from yuriks/sync-logging
...
Common: Remove async logging
2015-05-15 20:54:48 -07:00
purpasmart96
dd9aed9ea9
CFG: Update the cfg service to be like other integrated services
2015-05-15 20:19:29 -07:00
Yuri Kunde Schlesner
7dbc27ff57
Remove unused concurrent_ring_buffer.h
2015-05-15 23:57:53 -03:00
purpasmart96
0fd727f3ad
APT/FS: Remove asserts that were causing false positives
2015-05-15 19:25:02 -07:00
Yuri Kunde Schlesner
12f6216741
Merge pull request #774 from lioncash/decodings
...
dyncom: Add ARMv6K NOP and hint instructions to the interpreter.
2015-05-15 11:36:20 -07:00
bunnei
6abed88092
Merge pull request #770 from lioncash/dyncom_clean
...
dyncom: Minor cleanup.
2015-05-15 09:44:39 -04:00
bunnei
ef8d0e9823
Merge pull request #761 from Subv/resource_limits
...
Core/ResourceLimits: Implemented the basic structure of ResourceLimits.
2015-05-15 09:42:36 -04:00
Yuri Kunde Schlesner
a188e0fa57
Merge pull request #675 from jroweboy/windows-build-fixes
...
Windows build fixes
2015-05-14 20:55:58 -07:00
Subv
d3634d4bf4
Core/ResourceLimits: Implemented the basic structure of ResourceLimits.
...
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.
2015-05-14 22:50:13 -05:00
Yuri Kunde Schlesner
dd4430609a
Memory: Use a table based lookup scheme to read from memory regions
2015-05-15 00:04:43 -03:00
Yuri Kunde Schlesner
52158c1b8d
Memory: Read SharedPage directly from Memory::Read
2015-05-15 00:04:41 -03:00
Yuri Kunde Schlesner
ec514b16a6
Memory: Read ConfigMem directly from Memory::Read
2015-05-15 00:04:39 -03:00
Yuri Kunde Schlesner
7ada357b2d
Memmap: Re-organize memory function in two files
...
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.
2015-05-15 00:04:38 -03:00
Yuri Kunde Schlesner
a251721bf3
Memmap: Remove unused declarations
2015-05-15 00:04:38 -03:00
bunnei
9f503387dc
Merge pull request #769 from lioncash/cond
...
thread: Fix a conditional check in Reschedule
2015-05-14 16:39:56 -04:00
Lioncash
8cd72428c9
dyncom: Add ARMv6K NOP and hint instructions to the decoding table
2015-05-14 16:25:02 -04:00
Lioncash
699b67d7cf
dyncom: Handle some MSR variants individually
...
This is necessary, as hint instructions will be recognized as MSR, which is pretty bad.
2015-05-14 16:24:51 -04:00
Lioncash
be0119be08
dyncom: Move exclusive load/stores above bbl and swi in the decoding table
2015-05-14 16:24:39 -04:00
Lioncash
1e0255364c
dyncom: Remove duplicate enums/prototypes
...
These are already defined in arm_dyncom_interpreter_dec.cpp.
2015-05-14 14:32:17 -04:00
Lioncash
f4921d0f9d
dyncom: Remove unnecessary defines
...
These can simply be const vars.
2015-05-14 14:32:16 -04:00
Lioncash
0530fd2499
dyncom: Make translation-unit functions and variables static
2015-05-14 14:32:07 -04:00
Lioncash
497f4bee0c
pica: Add the ULL specifier in IsDefaultAttribute
...
This is necessary otherwise there are warnings about a 32-bit result being casted to a 64-bit value.
2015-05-14 14:23:23 -04:00
Lioncash
773b1ef6bf
vfp: Get rid of warnings
...
- Unary minus operator applied to unsigned type.
- Unsafe use of bool.
2015-05-14 13:54:15 -04:00
Lioncash
150e700729
process: Get rid of warnings
...
Sign mismatches and "forcing value to bool" warnings.
2015-05-14 12:59:14 -04:00
Lioncash
f3c4de4ce4
dyncom: Remove unnecessary typedefs
2015-05-14 11:51:46 -04:00
Lioncash
a48b4ec583
dyncom: Remove unused structs
2015-05-14 11:33:50 -04:00
Lioncash
207087c856
thread: Fix a conditional check in Reschedule
2015-05-14 11:10:04 -04:00
Emmanuel Gil Peyrot
a31fd7f86b
Common: Remove unused cruft from math_util, and remove a duplicated Rect class in common_types.
2015-05-14 16:16:15 +02:00
bunnei
e83bc5b7ee
dyncom: Removed irrelevant log.
2015-05-14 00:24:38 -04:00
bunnei
09c8110e1a
Merge pull request #763 from bunnei/qt-fix-crash
...
Qt: Shutdown emulation session only if EmuThread exists.
2015-05-13 22:07:35 -04:00
Lioncash
832c130ed1
dyncom: Fix decoding of BKPT's immediate
...
A shift here is intended since the representation is imm12:imm4
2015-05-13 14:11:03 -04:00
bunnei
c3bd797917
Qt: Shutdown emulation session only if EmuThread exists.
2015-05-12 23:14:24 -04:00
bunnei
7d21b0663b
Merge pull request #756 from purpasmart96/ptm_service_changes
...
PTM: Changed the ptm services to be like the IR, HID, and APT services.
2015-05-12 23:10:54 -04:00
Yuri Kunde Schlesner
def5913d19
GPU: Add more fine grained profiling for vertex shader and rasterization
2015-05-12 15:59:52 -03:00
Yuri Kunde Schlesner
c8eae338a8
Common: Use the log system to print assert messages
2015-05-12 02:52:31 -03:00
Yuri Kunde Schlesner
b88c91dd3d
Common: Remove async logging
...
It provided a large increase in complexity of the logging system while
having a negligible performance impact: the usage patterns of the ring
buffer meant that each log contended with the logging thread, causing
it to effectively act as a synchronous extra buffering.
Also removed some broken code related to filtering of subclasses which
was broken since it was introduced. (Which means no one ever used that
feature anyway, since, 8 months later, no one ever complained.)
2015-05-12 02:31:04 -03:00
bunnei
cb2b2071a8
Merge pull request #748 from Subv/tls_max
...
Core/Memory: Add TLS support for creating up to 300 threads
2015-05-11 23:32:28 -04:00
bunnei
ee8da4c356
Merge pull request #751 from yuriks/idle-thread
...
Thread: Remove the idle thread
2015-05-11 23:22:47 -04:00
bunnei
6e26d063a5
Merge pull request #757 from Subv/scheduling
...
Core/Scheduling: Prepare the new priority in the thread queue when svcSetPriority is called
2015-05-11 22:54:00 -04:00
bunnei
6223496a49
Merge pull request #752 from lioncash/flush
...
vfp: Handle flush-to-zero mode.
2015-05-11 21:43:33 -04:00
bunnei
d22bc68175
Merge pull request #755 from lioncash/mcrr-mrrc
...
dyncom: Stub MCRR and MRRC
2015-05-11 21:42:45 -04:00
Yuri Kunde Schlesner
4f7a055081
Thread: Remove the idle thread
...
Instead just use nullptr to represent no thread is active.
2015-05-11 22:39:39 -03:00
Subv
dda94e56dd
Core/Memory: Add TLS support for creating up to 300 threads
2015-05-11 20:09:23 -05:00
Yuri Kunde Schlesner
820b97787c
Merge pull request #750 from Subv/process_svc
...
Core/HLE: Implemented the SVCs GetProcessId and GetProcessIdOfThread
2015-05-11 17:44:26 -07:00
Subv
dbc1320923
Core/Scheduling: Prepare the new priority in the thread queue when svcSetPriority is called
2015-05-11 19:38:10 -05:00
purpasmart96
53130fffd9
PTM: Changed the way the ptm services are handled to be like the
...
IR, HID, and APT services.
2015-05-11 17:11:26 -07:00
Subv
25c010dc7d
fixup!
2015-05-11 18:23:45 -05:00
Lioncash
dc7ac751f2
dyncom: Stub MCRR and MRRC
...
There's no other coprocessor outside the VFP (which has its own VMOV variants) in which the MPCore can send/retrieve data from.
Stubbed so citra won't crash and burn on the odd chance someone actually tries to use these.
2015-05-11 18:31:45 -04:00
purpasmart96
046044618d
NWM_UDS: Fix a typo in the nwm service port name
2015-05-11 15:18:54 -07:00
Lioncash
ffc51161f3
vfp: Handle flush-to-zero mode.
2015-05-11 15:56:02 -04:00
bunnei
10eb8b0c02
Merge pull request #749 from yuriks/stack-top
...
Thread: Correctly set main thread initial stack position
2015-05-11 11:03:08 -04:00
Subv
41f74a16fd
Core/HLE: Implemented the SVCs GetProcessId and GetProcessIdOfThread
2015-05-11 09:15:10 -05:00
Yuri Kunde Schlesner
d16c2bd956
Thread: Correctly set main thread initial stack position
2015-05-11 05:08:47 -03:00
archshift
40310e2132
Implement I4 texture format
...
@neobrain, could you confirm that this is correct?
It's been tested with various different games and fixes different textures, including in Animal Crossing, Kirby Triple Deluxe, and SMB3D.
2015-05-10 18:59:22 -07:00
archshift
e98fbadf4a
Merge pull request #740 from yuriks/gsp-shmem
...
Fix crashes due to un-initialized GSP shared memory
2015-05-10 18:07:44 -07:00
Subv
115ad8e16a
fixup! Set the TLS address in the scheduler
2015-05-10 18:43:59 -05:00
Subv
000876858d
Core/Memory: Give every emulated thread it's own TLS area.
...
The TLS area for thread T with id Ti is located at TLS_AREA_VADDR + (Ti - 1) * 0x200.
This allows some games like Mario Kart 7 to continue further.
2015-05-10 18:35:37 -05:00
Yuri Kunde Schlesner
fd85367621
fixup! GSP: Small tweaks to shared memory initialization
2015-05-10 20:09:41 -03:00
Yuri Kunde Schlesner
1538a34eda
GSP: Small tweaks to shared memory initialization
2015-05-10 20:05:30 -03:00
Yuri Kunde Schlesner
774eea8374
Kernel: Zero-fill shared memory blocks when mapping
...
This works around crashes related to GSP/HID/etc. shared memory blocks
having garbage values. The proper fix requires proper management of
mapped memory blocks in the process.
2015-05-10 20:05:29 -03:00
Yuri Kunde Schlesner
c96f22490a
Kernel: Capture SharedMemory attributes at creation, not when mapping
2015-05-10 19:47:07 -03:00
bunnei
23e8be573e
rasterizer: Implemented combiner output scaling.
2015-05-09 22:26:17 -04:00
bunnei
ff767eeb40
rasterizer: Implemented AddSigned combiner op.
2015-05-09 22:12:39 -04:00
bunnei
547da374b8
rasterizer: Fixed a depth testing bug.
2015-05-09 22:12:38 -04:00
bunnei
a806b420a6
rasterizer: Implement combiner buffer input.
2015-05-09 22:12:36 -04:00
bunnei
44927f0306
rasterizer: Return zero'd vectors on error conditions.
2015-05-09 22:12:35 -04:00
bunnei
692a74c09e
vertex_shader: Implement FLR instruction.
2015-05-09 22:12:34 -04:00
bunnei
f935130a0f
vertex_shader: Implement MADI instruction.
...
nihstro: Update submodule to latest upstream/master to support MADI instruction decoding.
2015-05-09 22:12:34 -04:00
Yuri Kunde Schlesner
b700b55696
Common: Remove the BIT macro
...
When the macro was introduced in 326ec51261
it wasn't noticed that it conflicted in name with a heavily used macro
inside of dyncom. This causes some compiler warnings. Since it's only
lightly used, it was opted to simply remove the new macro.
2015-05-09 18:16:46 -03:00
Tony Wasserka
e35e72d0a5
Merge pull request #734 from yuriks/memmap
...
Small memory map definitions cleanup
2015-05-09 15:57:29 +02:00
Yuri Kunde Schlesner
417c867e14
Loader: Add missing include
2015-05-09 05:05:59 -03:00
Yuri Kunde Schlesner
17a8cae003
Memory: Add GetPhysicalPointer helper function
2015-05-09 04:02:32 -03:00
Yuri Kunde Schlesner
28a9e4c1d5
Memory: Support more regions in the VAddr-PAddr translation functions
...
Also adds better documentation and removes the one-off reimplementation
of the function in pica.h.
2015-05-09 03:08:11 -03:00
Yuri Kunde Schlesner
e7b6ed7578
Memory: Sort memory region variables by VAddr
2015-05-09 01:31:00 -03:00
Yuri Kunde Schlesner
1c0b87edc2
Memory: Re-organize and rename memory area address constants
2015-05-09 01:29:52 -03:00
Yuri Kunde Schlesner
eb3eb9f75d
Loader: Remove .bin file support
...
It is of very limited practical utility currently, and will soon be
impossible to support due to more accurate memory map emulation.
2015-05-08 23:09:41 -03:00
Yuri Kunde Schlesner
7c50b999fa
Kernel: Remove unused g_main_thread variable
2015-05-08 22:12:12 -03:00
Yuri Kunde Schlesner
3cb19c9589
Process: Rename StaticAddressMapping => AddressMapping
2015-05-08 22:12:10 -03:00
Yuri Kunde Schlesner
83ccf85bb2
Process: Add more documentation to the class members
2015-05-08 22:11:49 -03:00
Yuri Kunde Schlesner
2f5904611d
Process: Use BitField to store process flags
2015-05-08 22:11:48 -03:00
Yuri Kunde Schlesner
7eb413155f
Loader/NCCH: Fix formatting of braces
2015-05-08 22:11:48 -03:00
Yuri Kunde Schlesner
2af30d465f
Process: Support parsing of exheader kernel caps
2015-05-08 22:11:44 -03:00
Yuri Kunde Schlesner
326ec51261
Common: Add BIT macro
2015-05-08 22:11:04 -03:00
Yuri Kunde Schlesner
a5eba2f984
Kernel: Remove g_program_id
...
This has been obsoleted by the field in Process.
2015-05-08 22:11:03 -03:00
Yuri Kunde Schlesner
6d60acf0f1
Kernel: Introduce skeleton Process class to hold process data
2015-05-08 22:11:02 -03:00
Yuri Kunde Schlesner
8809d02db3
Common: Add StringFromFixedZeroTerminatedBuffer
2015-05-08 03:03:06 -03:00
Yuri Kunde Schlesner
0f39cc359b
Core: Fix sorting in CMakeFiles.txt
2015-05-08 03:03:04 -03:00
Lioncash
1622068198
Merge pull request #728 from lioncash/vars
...
dyncom: Remove an unnecessary variable in the interpreter
2015-05-07 21:09:03 -04:00
Lioncash
ae0c38a333
Remove unnecessary dyncom header files
2015-05-07 20:45:28 -04:00
Lioncash
31dc8b8890
dyncom: Remove an unnecessary variable in the interpreter
...
All this was doing was needlessly aliasing a variable.
2015-05-07 19:34:04 -04:00
Yuri Kunde Schlesner
4560178f66
Merge pull request #725 from yuriks/remove-common-crap
...
Remove unused hash and mem_arena from common
2015-05-07 16:18:03 -07:00
bunnei
10ef39624a
Merge pull request #723 from lioncash/commonstr
...
string_util: Get rid of UriDecode/UriEncode
2015-05-07 18:55:18 -04:00
Yuri Kunde Schlesner
ed12b08e7a
Profiler: Fix off-by-one error when computing average.
2015-05-07 19:48:31 -03:00
Yuri Kunde Schlesner
3396f352cb
Common: Remove mem_arena.cpp/h
...
It is superfluous for Citra. (It's only really necessary if you're doing
JIT. We were using it but not taking any advantage from it.) This should
make 32-bit builds work again.
2015-05-07 19:01:09 -03:00
Yuri Kunde Schlesner
d9df5b575a
Common: Remove hash.cpp/h
...
Currently unused and the code quality is pretty questionable.
2015-05-07 18:31:18 -03:00
Yuri Kunde Schlesner
fae5933ad6
Common: Add proper macros to test for architecture pointer size
...
The old system of just defining macros available in some other platform
was susceptible to silently using the wrong code if you forgot to
include a particular header. This fixes a crash on non-Windows platforms
introduced by e1fbac3ca1
.
2015-05-07 18:22:36 -03:00
Lioncash
9adad45b0f
string_util: Get rid of UriDecode/UriEncode
2015-05-07 17:10:55 -04:00
Yuri Kunde Schlesner
4f4d230dac
Merge pull request #721 from yuriks/more-cleanups
...
More cleanups
2015-05-07 11:45:45 -07:00
Yuri Kunde Schlesner
c956e8a686
Fix printf format warning
2015-05-07 15:45:22 -03:00
Yuri Kunde Schlesner
e1fbac3ca1
Common: Remove common.h
2015-05-07 15:45:22 -03:00
Yuri Kunde Schlesner
1bd1a13a02
Common: Move alignment macros to common_funcs.h
2015-05-07 15:45:21 -03:00
Yuri Kunde Schlesner
ae963d75f8
Common: Move SSE detection ifdefs to platform.h
2015-05-07 15:45:20 -03:00
Yuri Kunde Schlesner
a594fdb66e
Common: Remove more unused compatibility defines
2015-05-07 15:45:20 -03:00
Yuri Kunde Schlesner
f3c096951b
Common: Move IO-specific compatibility macros to file_util.cpp
2015-05-07 15:45:20 -03:00
Yuri Kunde Schlesner
bf12f270b3
Common: Remove many unnecessary cross-platform compatibility macros
2015-05-06 23:50:08 -03:00
Yuri Kunde Schlesner
c0eaa662d4
Clean-up includes
2015-05-06 23:45:06 -03:00
Yuri Kunde Schlesner
b89f644cfe
FileSys: De-inline Path members
2015-05-06 23:45:06 -03:00
Yuri Kunde Schlesner
6f89d25f90
FileSys: Clean-up includes, de-inline destructors
2015-05-06 23:45:06 -03:00
Yuri Kunde Schlesner
c916bcf7b5
Move typedefs from kernel.h to more appropriate places
2015-05-06 23:45:05 -03:00
Yuri Kunde Schlesner
6ad71c216b
Common: Move NonCopyable to common_types.h
2015-05-06 23:45:05 -03:00
Yuri Kunde Schlesner
7a4b717772
Common: Use C++11 deleted functions for NonCopyable
2015-05-06 23:45:04 -03:00
Yuri Kunde Schlesner
1fee769aa0
Common: Remove unused enums
2015-05-06 23:45:04 -03:00
bunnei
337f1e1b96
Merge pull request #695 from Subv/crash_f
...
GPU: Implemented default vertex shader attributes.
2015-05-06 19:33:03 -04:00
Subv
0e5ca080a8
GPU: Implemented default vertex shader attributes.
...
Fixes some games crashing.
2015-05-06 18:11:46 -05:00
Yuri Kunde Schlesner
ecff2351a1
HLE: Clean up SVC dispatch mechanism
2015-05-06 00:24:39 -03:00
Yuri Kunde Schlesner
0749687b8d
Core: Remove some unused functions and types
2015-05-04 00:16:43 -03:00
Tony Wasserka
7859b145cf
Merge pull request #698 from Zaneo/clip_stylus_input
...
EmuWindow: Clip mouse input coordinates to emulated screen dimensions.
2015-05-02 19:15:03 +02:00
Zaneo
b8328593fe
EmuWindow: Clip mouse input coordinates to emulated screen dimensions.
...
If the mouse position for a mouse move/drag would take it outside the emulated screen dimensions, clip the coordinates to
the emulated screen dimensions.
Qt and GLFW will report negative coordinates for mouse positions to the left, or above citra window. Added restriction
to mouse coordinates passed to touchmoved by Qt/GLFW to be greater or equal to zero.
2015-05-01 23:52:33 -04:00
bunnei
046dd6e3ef
Qt: Shutdown game on emulator close event.
2015-05-01 18:35:56 -04:00
bunnei
85cc81d8cc
Qt: Disable "Start" unless we are paused (it otherwise has no meaning and causes a crash).
2015-05-01 18:35:55 -04:00
bunnei
bc41de2131
Qt: Fixed a bug in shutdown procedure, various cleanups.
2015-05-01 18:35:51 -04:00
bunnei
ad4445c529
Qt: Clear registers widget on shutdown.
2015-05-01 18:34:49 -04:00
bunnei
43cf424907
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-05-01 18:34:42 -04:00
bunnei
e4ea133717
Qt: Restructured to remove unnecessary shutdown event and various cleanups.
2015-05-01 18:27:07 -04:00
bunnei
3dd2688785
Qt: Fix loading a new game without stopping emulation.
2015-05-01 18:27:06 -04:00
bunnei
5a855bdb2f
CoreTiming: Initialize static variables at bootup.
2015-05-01 18:27:05 -04:00
bunnei
d3c2f9a4a4
HLE: Properly initialize and shutdown remaining modules.
2015-05-01 18:27:05 -04:00
bunnei
bab5abaf46
Dyncom: Move cream cache to ARMul_State.
2015-05-01 18:27:04 -04:00
bunnei
c7dc799e19
Kernel: Properly initialize and shutdown all modules.
2015-05-01 18:27:03 -04:00
bunnei
57aaaf92db
HW: Properly initialize and shutdown all modules.
2015-05-01 18:27:02 -04:00
bunnei
e0cb85691a
Services: Initialize all state variables at bootup.
2015-05-01 18:27:02 -04:00
bunnei
bbabed8e98
Memory: Properly cleanup & shutdown.
2015-05-01 18:27:01 -04:00
bunnei
28df8dbfeb
Qt: Create emu thread on bootup, kill it on shutdown.
2015-05-01 18:27:00 -04:00
bunnei
d5665fea89
EmuThread: Remove unused filename attribute.
2015-05-01 18:26:59 -04:00
bunnei
762c1a9ff5
Qt: Move EmuThread ownership from render window to main window.
2015-05-01 18:26:58 -04:00
bunnei
4d30edc11e
Merge pull request #717 from linkmauve/useless-auto
...
VideoCore: Remove a superfluous auto variable declaration in debug_utils
2015-04-29 10:27:58 -04:00
Emmanuel Gil Peyrot
36b48082d5
VideoCore: Remove a superfluous auto variable declaration in debug_utils.
2015-04-29 13:37:12 +02:00
purpasmart96
8716445621
ConfigMem: Remove duplicate retail bit
2015-04-28 16:22:50 -07:00
bunnei
2cc6511039
Merge pull request #692 from purpasmart96/log_improvements
...
Services/Loader: Use more sensible log formats for certain functions along with more info being logged.
2015-04-28 10:12:50 -04:00
purpasmart96
c3a480160e
Services/Loader: Use more sensible log formats for certain functions
...
along with more info being logged.
2015-04-27 23:07:08 -07:00
Lioncash
1baab50e7c
ptm_sysm: Add static specifier to IsLegacyPowerOff
2015-04-24 18:23:20 -04:00
Lioncash
8b2b620a5e
dyncom: Remove more unused/unnecessary code
...
Gets rid of a sizeable amount of stuff in armdefs.
2015-04-20 16:30:34 -04:00
bunnei
a698e15c5d
Merge pull request #703 from lioncash/cruft
...
dyncom: Remove unused/unnecessary VFP cruft
2015-04-19 20:50:41 -04:00
Lioncash
d66a12c6f6
dyncom: Remove unused/unnecessary VFP cruft
2015-04-17 20:46:05 -04:00
bunnei
5e55a525d8
Merge pull request #691 from rohit-n/sign-compare
...
Silence some -Wsign-compare warnings.
2015-04-17 20:22:03 -04:00
Yuri Kunde Schlesner
6402de9ae7
Common: thread.h cleanups
...
The helper classes are rendered obsolete by C++11 lambdas. Also made
formatting conform to our code style.
2015-04-16 17:55:30 -03:00
bunnei
3ee9f6c5d8
Merge pull request #696 from yuriks/interface-deinline
...
De-inline functions from Interface, removing them from service.h
2015-04-14 19:14:27 -04:00
Emmanuel Gil Peyrot
2e860bd59c
Core_ARM11: Replace debug prints with our own logging functions in vfpsingle.
2015-04-14 21:34:36 +02:00
Emmanuel Gil Peyrot
d9eb7ca95c
citra-qt: Use std::abs() to get the right absolute function for s64.
2015-04-14 21:18:35 +02:00
Emmanuel Gil Peyrot
0d69b2f7bd
Kernel: Use the correct format string for u64 hex.
2015-04-14 21:18:31 +02:00
Emmanuel Gil Peyrot
bdcf28e3bc
Headers: Add some forgotten overrides, thanks clang!
2015-04-14 21:18:25 +02:00
Yuri Kunde Schlesner
ad3e25b414
De-inline functions from Interface, removing them from service.h
...
This reduces the time for a full recompile from 65.43s to 59.53s (~9%)
2015-04-14 15:34:28 -03:00
bunnei
db4bd98bac
SVC: Assert on unsupported CreateThread processor ID.
2015-04-09 22:55:18 -04:00
Rohit Nirmal
f15c142c5e
Silence some -Wsign-compare warnings.
2015-04-09 18:55:01 -05:00
bunnei
c077bcefa9
SVC: Update various SVCs to cause a reschedule.
...
- CreateMutex/ReleaseMutex/ReleaseSemaphore/SetTimer/CancelTimer/ArbitrateAddress
2015-04-09 19:06:42 -04:00
bunnei
9c3419ebcc
Kernel: Implemented priority inheritance for mutexes.
2015-04-09 19:06:39 -04:00
bunnei
7b9f428b23
Thread: Implement priority boost for starved threads.
...
SVC: Return correct error code on invalid CreateThread processor ID.
SVC: Assert when creating a thread with an invalid userland priority.
2015-04-09 19:05:21 -04:00
bunnei
ee3377b67d
SVC: Reschedule on svcCreateThread.
2015-04-09 19:04:20 -04:00
bunnei
bdd190363d
APT: (Subv) Fix bug where start event was being incorrectly signaled.
2015-04-09 19:04:19 -04:00
bunnei
e08f55b1a7
Kernel: Fixed default thread priority.
2015-04-09 19:04:19 -04:00
Gareth Higgins
25a43cd2ec
Initialize base address to 0x0
2015-04-08 20:34:41 -04:00
Tony Wasserka
8af5753da5
Merge pull request #689 from lioncash/format
...
gpu: Fix a missing format specifier
2015-04-08 15:41:21 +02:00
bunnei
114126b216
Merge pull request #688 from lioncash/unused
...
dyncom: Remove unnecessary enum and typedef
2015-04-07 23:03:08 -04:00
bunnei
e630fd2a95
Merge pull request #676 from purpasmart96/ir_service_refc
...
IR: Move The IR services to their own folder and implement "GetHandles"
2015-04-07 23:01:07 -04:00
Lioncash
7da90dee42
gpu: Fix a missing format specifier
2015-04-07 10:38:49 -04:00
Lioncash
a6c9e453b2
dyncom: Remove unnecessary enum and typedef
...
Also fixes descriptions in the process.
2015-04-07 08:05:41 -04:00
Lioncash
29a4b6c7ed
vfp: Make the FPSID values match the MPCore
2015-04-06 16:09:35 -04:00
Lioncash
f9cc6d6484
vfp: Get rid of the VFP_OFFSET macro
2015-04-06 16:09:28 -04:00
bunnei
14dcd98653
Merge pull request #685 from lioncash/cpregs
...
dyncom: Set the MPCore CP15 register reset values on initialization.
2015-04-06 15:06:07 -04:00
Lioncash
8004d35ea1
core: Migrate 3DS-specific CP15 register setting into Init
2015-04-06 13:01:19 -04:00
Lioncash
c3ffe8f9c3
arm_interface: Support retrieval/storage to CP15 registers
2015-04-06 12:57:49 -04:00
Lioncash
b7b8b67620
Move CP15 enum definitions into their own enum.
...
Also gets rid of preprocessor mumbo-jumbo
2015-04-06 12:48:35 -04:00
Lioncash
23dd2ca8a6
dyncom: Properly return the value of the user RO thread register
2015-04-06 09:26:04 -04:00
Lioncash
e628ed4810
dyncom: Set CP15 reset values on initialization
2015-04-06 09:16:42 -04:00
Lioncash
bb7dac022e
dyncom: Suppress uninitialized variable warnings
...
The switch cases will always be hit, but this makes compilers stop complaining.
2015-04-05 23:49:06 -04:00
bunnei
8997cfaeb4
Merge pull request #682 from yuriks/virtmem2
...
Clean-up mem_map constants and fix framebuffer translation errors
2015-04-05 22:07:25 -04:00
Yuri Kunde Schlesner
34b009cf38
Clean-up mem_map constants and fix framebuffer translation errors
2015-04-05 20:14:33 -03:00
Gareth Higgins
8060c519a6
Changed occurences of colour to color for consistency
2015-04-05 02:36:43 -04:00
bunnei
64196976b9
Merge pull request #680 from archshift/bg-color
...
Allow the user to set the background clear color during emulation
2015-04-04 15:14:14 -04:00
purpasmart96
d6c9af600f
IR: Move The IR services to their own folder and implement "GetHandles"
2015-04-03 19:36:03 -07:00
bunnei
3fd2cc566b
Merge pull request #641 from purpasmart96/service_stubs
...
Services: Stubs and minor changes
2015-04-03 22:16:50 -04:00
archshift
cae89fb315
Allow the user to set the background clear color during emulation
...
The background color can be seen at the sides of the bottom screen or when the window is wider than normal.
2015-04-03 15:35:51 -07:00
purpasmart96
198c0ddc72
Services: Stubs and minor changes
2015-04-02 20:05:11 -07:00
bunnei
e25ffaba86
Merge pull request #677 from lioncash/cp15
...
dyncom: Isolate CP15 register reading and writing
2015-04-02 20:21:11 -04:00
Lioncash
490df716f3
dyncom: Move CP15 register writing into its own function.
...
Also implements writing to the rest of the ARM11 MPCore CP15 register set.
2015-04-02 00:20:52 -04:00
Lioncash
5e5954c63b
dyncom: Move CP15 register reading into its own function.
...
Keeps everything contained. Added all supported readable registers in an ARM11 MPCore.
2015-04-02 00:19:11 -04:00
bunnei
d95d6e3ecd
Merge pull request #678 from lioncash/disasm
...
callstack: Remove unnecessary disassembler instantiation
2015-03-31 22:33:23 -04:00
Lioncash
e05d6220f5
disassembler: Get rid of a const_cast
2015-03-30 15:37:34 -04:00
Lioncash
0520a3b178
callstack: Remove unnecessary disassembler instantiation
...
Decode is a static function. There's no need to allocate a disassembler instance.
2015-03-30 11:25:02 -04:00
Lioncash
de6eba0288
dyncom: Migrate InAPrivilegedMode to armsupp
...
It's a generic helper function, so it should be here anyway.
2015-03-26 09:22:02 -04:00
James Rowe
635ed87788
unsetting a few more variables that arent needed outside of this function
2015-03-26 04:11:05 -06:00
James Rowe
5b9a5493c5
Updated the copy commands to run on post_build and use generator expressions to simplify the code as well
2015-03-26 04:04:24 -06:00
James Rowe
2d7008f03c
Changes to bring the previous commits in line with the comments on thepull request. Made the debug build a true debug build with no optimizxations and the RelWithDebInfo is what it says it is too. Changed the copying of the dlls to the build directories to happen at configuration time instead of build time
2015-03-26 04:04:23 -06:00
James Rowe
4a7e21eb58
More changes to the CMakeFiles for better MSVC compatibility. Added in the RelWithDebInfo target and setup copying the Qt 5 Dlls to the output directories.
2015-03-26 04:04:22 -06:00
bunnei
c4767f3bb2
Merge pull request #672 from purpasmart96/citra_moar_app_mem
...
ConfigMem: Set the app memory to be 96MB instead of the default 64MB
2015-03-24 23:22:56 -04:00
bunnei
b3d4a10e29
Merge pull request #674 from lioncash/sys-instrs
...
dyncom: Implement RFE and SRS.
2015-03-24 23:21:44 -04:00
Lioncash
a80d93685a
dyncom: Implement SRS
2015-03-24 12:44:31 -04:00
Lioncash
cde671795c
dyncom: Implement RFE
2015-03-24 11:34:48 -04:00
Lioncash
2df10d2284
dyncom: Remove unused/unnecessary macros and macro constants
2015-03-24 09:55:56 -04:00
purpasmart96
e0c72ec871
ConfigMem: Set the app memory to be 96MB instead of the default 64MB
2015-03-23 18:53:22 -07:00
bunnei
03ceb7adf9
Merge pull request #656 from Subv/nz
...
Services/FS: Implemented DeleteExtSaveData, CreateSystemSaveData and Del...
2015-03-22 14:58:38 -04:00
Lioncash
f23f2a9a42
armmmu: Remove unnecessary enum values
...
We don't need to care about XScale or Intel specific ARM stuff.
2015-03-20 19:35:32 -04:00
bunnei
1981aa3d7e
Merge pull request #659 from lioncash/setend
...
Implement SETEND.
2015-03-19 21:37:43 -04:00
Subv
b9612fe919
Service/FS: Document and log some unknown values.
...
In CreateExtSaveData, DeleteExtSaveData and CreateSystemSaveData
2015-03-19 17:39:00 -05:00
bunnei
580b317821
Merge pull request #650 from Subv/scaling
...
GPU: Fixed the bit 25 in the display transfer flags.
2015-03-17 19:13:06 -04:00
Lioncash
9fdb311d6e
dyncom: Make Load/Store instructions support big endian
2015-03-17 15:13:32 -04:00
bunnei
0bb4b77b78
Merge pull request #655 from purpasmart96/hid_fixes
...
HID: Proper Signal Interrupts for EnableAccelerometer & EnableGyroscopeLow along with a stub for GetSoundVolume
2015-03-17 10:19:59 -04:00
purpasmart96
5b1757d6a5
HID: Proper Signal Interrupts for EnableAccelerometer & EnableGyroscopeLow along
...
with a stub for GetSoundVolume
2015-03-16 18:55:58 -07:00
bunnei
ef0c4aac86
Merge pull request #660 from purpasmart96/ncch_updates
...
NCCH: Minor updates to the ncch header
2015-03-16 21:21:54 -04:00
bunnei
6977877665
Merge pull request #661 from linkmauve/cleanup
...
Fix two minor understandability issues in common
2015-03-16 20:32:51 -04:00
Subv
23b401c3ac
GPU/DisplayTransfer: Made the scaling bits a single 2bit value
...
Rephrased some comments.
2015-03-16 17:54:06 -05:00
bunnei
c1f5cb7dd5
Merge pull request #652 from neobrain/shader_output_fix
...
Pica/VertexShader: Fix a bug caused due to incorrect assumptions of consecutive output register tables.
2015-03-16 18:35:34 -04:00
bunnei
968c418fa5
Merge pull request #662 from linkmauve/video_core-warnings
...
Add static_cast around expressions where the compiler doesn’t deduce the right type
2015-03-16 18:18:24 -04:00
Lioncash
8cf81643a9
arm_interface: Get rid of GetTicks.
...
Removes a TODO.
2015-03-16 12:18:37 -04:00
Emmanuel Gil Peyrot
92fd2a1ee3
VideoCore: Add static_cast around expressions where the compiler doesn’t deduce the right type.
2015-03-16 15:14:04 +01:00
Emmanuel Gil Peyrot
188b419586
Common: Fix logic for setting EMU_DATA_DIR.
2015-03-16 02:22:59 +01:00
Emmanuel Gil Peyrot
4c684fb274
Common: Make a #else more apparent.
2015-03-16 02:22:19 +01:00
purpasmart96
061c69a6bb
NCCH: Minor updates to the ncch header
2015-03-15 14:17:19 -07:00
bunnei
3e5aeb9a7a
Merge pull request #657 from Subv/flip
...
GPU: Implemented the flip_data (bit 0) bit in display transfers.
2015-03-14 23:11:29 -04:00
Lioncash
f280806214
dyncom: Implement SETEND
2015-03-14 23:08:36 -04:00
Subv
fb8f47060b
GPU: Implemented the flip_data (bit 0) bit in display transfers.
2015-03-14 15:26:42 -05:00
Subv
c0d1a91017
EmuWindow: Fixed a reference to a temporary variable
...
in GetTouchState()
2015-03-14 15:01:02 -05:00
Subv
1d61cd4460
Services/FS: Implemented DeleteExtSaveData, CreateSystemSaveData and DeleteSystemSaveData
...
Also fixed a bug with CreateExtSaveData that made it unable to create ExtSaveData archives in the SDMC directory.
2015-03-14 12:00:01 -05:00
Tony Wasserka
e4f5ec6272
Pica/VertexShader: Fix a bug caused due to incorrect assumptions of consecutive output register tables.
...
We now write create a temporary buffer for output registers and copy all of them to the actual output vertex structure after the shader has run. This is technically not necessary, but it's easier to vectorize in the future.
2015-03-12 14:18:46 +01:00
bunnei
ed5b275d21
Merge pull request #642 from bunnei/touchpad
...
Touchpad support
2015-03-11 21:28:57 -04:00
bunnei
4bbddda377
hid_user: Removed unnecessary includes.
2015-03-11 00:01:03 -04:00
bunnei
e79c27f1e0
HID: Removed unnecessary global variables.
2015-03-11 00:00:39 -04:00
bunnei
85cbccb1d3
HID: Added additional variable comments and some code cleanups.
2015-03-10 23:58:13 -04:00
bunnei
d61b26b79f
HID: Complete refactor of pad/touch input to fix threading issues.
2015-03-10 23:58:07 -04:00
bunnei
b56829df02
Merge pull request #629 from archshift/lcdfb
...
Implement SetLcdForceBlack and add implementation for color filling in the GPU code
2015-03-10 18:08:55 -04:00
bunnei
953e09ddb5
EmuWindow: Made pad/touch functions non-static.
2015-03-10 18:05:20 -04:00
bunnei
a1a1a5c6c5
HID: Cleanup how next_touch_index
is calculated for Pad and touch.
2015-03-10 18:05:19 -04:00
bunnei
432aa1044c
HID: Changed TouchDataEntry valid
to a BitField and added some doc strings.
2015-03-10 18:05:19 -04:00
bunnei
e9b9f1842b
HID: Added static asserts to check register position in shared memory.
2015-03-10 18:05:19 -04:00
bunnei
f213000cc4
Qt: Implemented EmuWindow touchpad support.
2015-03-10 18:05:18 -04:00
bunnei
dd73217ae3
GLFW: Implemented EmuWindow touchpad support.
2015-03-10 18:05:18 -04:00
bunnei
543232436f
EmuWindow: Added infrastructure code to enable touchpad support.
2015-03-10 18:05:17 -04:00
bunnei
1a904ded40
HID: Added functions to emulate the touchpad.
2015-03-10 18:05:17 -04:00
bunnei
3229b048d9
HID: Moved some docstrings to the header.
2015-03-10 18:05:17 -04:00
bunnei
83a66dd701
HID: Refactored shared memory decoding for touchpad support.
2015-03-10 18:05:16 -04:00
Subv
ae0dfcae1d
GPU: Fixed the bit 25 in the display transfer flags.
...
It is used to downscale the input image horizontally and vertically, previously we were only downscaling it vertically so this caused a hard-to-debug memory corruption problem.
2015-03-10 14:18:25 -05:00
Lioncash
e34ba68e1f
dyncom: Minor cleanup
...
Assemblers will exit with an error when trying to assemble instructions with disallowed registers.
2015-03-10 08:13:58 -04:00
bunnei
ec5bc54575
Merge pull request #643 from Subv/dem_feels
...
GPU: Implemented more depth buffer formats.
2015-03-09 22:06:30 -04:00
Subv
1248e291f0
GPU: Added the stencil test structure to the Pica Regs struct.
2015-03-09 20:13:21 -05:00
Subv
155cc80e3b
Frontend/Qt: Allow the framebuffer widget to inspect the depth buffer
2015-03-09 20:13:15 -05:00
Subv
414b0741c4
GPU: Implemented more depth buffer formats.
...
This fixes the horizontal lines in Picross E, Cubic Ninja, Cave Story 3D and possibly others
2015-03-09 20:12:39 -05:00
bunnei
e10a9b2f66
Merge pull request #647 from neobrain/rip_culling_hack
...
Pica/PrimitiveAssembly: Fix triangle strips and fans being generated with incorrect winding order.
2015-03-09 19:17:43 -04:00
archshift
041e99b613
Added LCD registers, and implementation for color filling in OGL code.
2015-03-09 15:51:41 -07:00
Tony Wasserka
511bf30a69
Merge pull request #648 from Subv/fill_bit
...
GPU: Use the correct position for the finished bit in memory fills
2015-03-09 23:17:11 +01:00
Subv
0abba5874c
GPU: Use the correct position for the finished bit in memory fills
2015-03-09 17:15:13 -05:00
Tony Wasserka
e3a697b9f9
Merge pull request #646 from Subv/24bit_fills
...
GPU: Corrected the 24 bit memory fills component order
2015-03-09 23:12:30 +01:00
Tony Wasserka
5742367341
Pica/PrimitiveAssembly: Fix triangle strips and fans being generated with incorrect winding order.
2015-03-09 21:49:49 +01:00
bunnei
8a1cc5b805
Merge pull request #589 from kevinhartman/config-errors
...
Fix errorcodes for bad config block request
2015-03-09 15:44:34 -04:00
bunnei
3da94a597b
Merge pull request #634 from linkmauve/logging-performances
...
Apply the logging filter before sending the message to the queue
2015-03-09 15:42:18 -04:00
bunnei
f2a7c2b3b7
Merge pull request #645 from lioncash/ldm
...
Minor bugfixes to LDM/STM.
2015-03-09 11:07:52 -04:00
Subv
a762f9c176
GPU: Corrected the 24 bit memory fills component order
2015-03-09 09:01:41 -05:00
bunnei
8ecba90ff0
Merge pull request #644 from archshift/nihstro
...
Update nihstro submodule to the initial release version.
2015-03-08 22:26:02 -04:00
bunnei
ba8ce6c8f5
Merge pull request #584 from yuriks/outline-asserts
...
Asserts: Use lambdas to keep assertion code away from the main code path
2015-03-08 22:25:04 -04:00
Lioncash
386dbab5ea
dyncom: Fix an indexing bug in STM
...
Previously it would write the contents of register 13 for the case where the link register (r14) is supposed to be written.
2015-03-08 22:03:11 -04:00
Lioncash
36dab56c31
dyncom: General cleanup of STM
2015-03-08 22:03:06 -04:00
Lioncash
e37425b380
dyncom: Increment addr when accessing LR in LDM
2015-03-08 21:46:57 -04:00
archshift
7d43aef4d0
Update nihstro submodule to the initial release version.
...
Includes more opcodes to implement in the future.
2015-03-08 13:52:38 -07:00
archshift
30e41de347
Merge pull request #639 from archshift/appbundle
...
Build app bundles on OS X. Fixes the issue where the menubar would not appear.
2015-03-07 18:15:10 -08:00
archshift
539bbd3c59
default_ini.h: Put comments on their own lines
...
Apparently inline comments is not necessarily standard in the INI format, and our parser was erroneously parsing the comments as values.
2015-03-07 17:28:29 -08:00
archshift
c036cf604f
Build app bundles on OS X. Fixes the issue where the menubar would not appear.
2015-03-07 16:09:00 -08:00