1 files changed, 33 insertions, 9 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8723a471..0ab0e440 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -6,13 +6,9 @@ set(SRCS
             arm/dyncom/arm_dyncom_interpreter.cpp
             arm/dyncom/arm_dyncom_run.cpp
             arm/dyncom/arm_dyncom_thumb.cpp
-            arm/interpreter/arm_interpreter.cpp
             arm/interpreter/armcopro.cpp
-            arm/interpreter/armemu.cpp
             arm/interpreter/arminit.cpp
             arm/interpreter/armsupp.cpp
-            arm/interpreter/armvirt.cpp
-            arm/interpreter/thumbemu.cpp
             arm/skyeye_common/vfp/vfp.cpp
             arm/skyeye_common/vfp/vfpdouble.cpp
             arm/skyeye_common/vfp/vfpinstr.cpp
@@ -30,6 +26,7 @@ set(SRCS
             hle/kernel/kernel.cpp
             hle/kernel/mutex.cpp
             hle/kernel/semaphore.cpp
+            hle/kernel/session.cpp
             hle/kernel/shared_memory.cpp
             hle/kernel/timer.cpp
             hle/kernel/thread.cpp
@@ -37,32 +34,46 @@ set(SRCS
             hle/service/act_u.cpp
             hle/service/am_app.cpp
             hle/service/am_net.cpp
+            hle/service/am_sys.cpp
             hle/service/apt_a.cpp
+            hle/service/apt_s.cpp
             hle/service/apt_u.cpp
+            hle/service/boss_p.cpp
             hle/service/boss_u.cpp
+            hle/service/cam_u.cpp
+            hle/service/cecd_s.cpp
             hle/service/cecd_u.cpp
             hle/service/cfg/cfg.cpp
             hle/service/cfg/cfg_i.cpp
+            hle/service/cfg/cfg_s.cpp
             hle/service/cfg/cfg_u.cpp
             hle/service/csnd_snd.cpp
             hle/service/dsp_dsp.cpp
             hle/service/err_f.cpp
+            hle/service/frd_a.cpp
             hle/service/frd_u.cpp
             hle/service/fs/archive.cpp
             hle/service/fs/fs_user.cpp
             hle/service/gsp_gpu.cpp
-            hle/service/hid_user.cpp
+            hle/service/hid/hid.cpp
+            hle/service/hid/hid_user.cpp
+            hle/service/hid/hid_spvr.cpp
+            hle/service/gsp_lcd.cpp
             hle/service/http_c.cpp
             hle/service/ir_rst.cpp
             hle/service/ir_u.cpp
             hle/service/ldr_ro.cpp
             hle/service/mic_u.cpp
             hle/service/ndm_u.cpp
+            hle/service/news_s.cpp
             hle/service/news_u.cpp
             hle/service/nim_aoc.cpp
+            hle/service/ns_s.cpp
             hle/service/nwm_uds.cpp
             hle/service/pm_app.cpp
+            hle/service/ptm_play.cpp
             hle/service/ptm_u.cpp
+            hle/service/ptm_sysm.cpp
             hle/service/service.cpp
             hle/service/soc_u.cpp
             hle/service/srv.cpp
@@ -70,6 +81,7 @@ set(SRCS
             hle/service/y2r_u.cpp
             hle/config_mem.cpp
             hle/hle.cpp
+            hle/shared_page.cpp
             hle/svc.cpp
             hw/gpu.cpp
             hw/hw.cpp
@@ -93,15 +105,12 @@ set(HEADERS
             arm/dyncom/arm_dyncom_interpreter.h
             arm/dyncom/arm_dyncom_run.h
             arm/dyncom/arm_dyncom_thumb.h
-            arm/interpreter/arm_interpreter.h
             arm/skyeye_common/arm_regformat.h
-            arm/skyeye_common/armcpu.h
             arm/skyeye_common/armdefs.h
             arm/skyeye_common/armemu.h
             arm/skyeye_common/armmmu.h
             arm/skyeye_common/armos.h
             arm/skyeye_common/skyeye_defs.h
-            arm/skyeye_common/skyeye_types.h
             arm/skyeye_common/vfp/asm_vfp.h
             arm/skyeye_common/vfp/vfp.h
             arm/skyeye_common/vfp/vfp_helper.h
@@ -130,32 +139,46 @@ set(HEADERS
             hle/service/act_u.h
             hle/service/am_app.h
             hle/service/am_net.h
+            hle/service/am_sys.h
             hle/service/apt_a.h
+            hle/service/apt_s.h
             hle/service/apt_u.h
+            hle/service/boss_p.h
             hle/service/boss_u.h
+            hle/service/cam_u.h
+            hle/service/cecd_s.h
             hle/service/cecd_u.h
             hle/service/cfg/cfg.h
             hle/service/cfg/cfg_i.h
+            hle/service/cfg/cfg_s.h
             hle/service/cfg/cfg_u.h
             hle/service/csnd_snd.h
             hle/service/dsp_dsp.h
             hle/service/err_f.h
+            hle/service/frd_a.h
             hle/service/frd_u.h
             hle/service/fs/archive.h
             hle/service/fs/fs_user.h
             hle/service/gsp_gpu.h
-            hle/service/hid_user.h
+            hle/service/hid/hid.h
+            hle/service/hid/hid_spvr.h
+            hle/service/hid/hid_user.h
+            hle/service/gsp_lcd.h
             hle/service/http_c.h
             hle/service/ir_rst.h
             hle/service/ir_u.h
             hle/service/ldr_ro.h
             hle/service/mic_u.h
             hle/service/ndm_u.h
+            hle/service/news_s.h
             hle/service/news_u.h
             hle/service/nim_aoc.h
+            hle/service/ns_s.h
             hle/service/nwm_uds.h
             hle/service/pm_app.h
+            hle/service/ptm_play.h
             hle/service/ptm_u.h
+            hle/service/ptm_sysm.h
             hle/service/service.h
             hle/service/soc_u.h
             hle/service/srv.h
@@ -165,6 +188,7 @@ set(HEADERS
             hle/result.h
             hle/function_wrappers.h
             hle/hle.h
+            hle/shared_page.h
             hle/svc.h
             hw/gpu.h
             hw/hw.h