libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-24 08:39:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5598 from lioncash/vertical-alignments

Browse Source 
Fix up some vertical alignments in misc Core source files.
This commit is contained in:
Henrik Rydgård 2014-03-03 18:29:19 +01:00
commit 0846abbd54
44 changed files with 560 additions and 560 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Core/Dialog/PSPDialog.h
View File

@ -23,13 +23,13 @@
class PointerWrap; class PointerWrap;
#define SCE_UTILITY_DIALOG_RESULT_SUCCESS 0 #define SCE_UTILITY_DIALOG_RESULT_SUCCESS 0
#define SCE_UTILITY_DIALOG_RESULT_CANCEL 1 #define SCE_UTILITY_DIALOG_RESULT_CANCEL 1
#define SCE_UTILITY_DIALOG_RESULT_ABORT 2 #define SCE_UTILITY_DIALOG_RESULT_ABORT 2
const int SCE_ERROR_UTILITY_INVALID_STATUS = 0x80110001; const int SCE_ERROR_UTILITY_INVALID_STATUS = 0x80110001;
const int SCE_ERROR_UTILITY_INVALID_PARAM_SIZE = 0x80110004; const int SCE_ERROR_UTILITY_INVALID_PARAM_SIZE = 0x80110004;
const int SCE_ERROR_UTILITY_WRONG_TYPE = 0x80110005; const int SCE_ERROR_UTILITY_WRONG_TYPE = 0x80110005;
struct pspUtilityDialogCommon struct pspUtilityDialogCommon
{ {
@ -58,11 +58,11 @@ public:
enum DialogStatus enum DialogStatus
{ {
SCE_UTILITY_STATUS_NONE = 0, SCE_UTILITY_STATUS_NONE = 0,
SCE_UTILITY_STATUS_INITIALIZE = 1, SCE_UTILITY_STATUS_INITIALIZE = 1,
SCE_UTILITY_STATUS_RUNNING = 2, SCE_UTILITY_STATUS_RUNNING = 2,
SCE_UTILITY_STATUS_FINISHED = 3, SCE_UTILITY_STATUS_FINISHED = 3,
SCE_UTILITY_STATUS_SHUTDOWN = 4 SCE_UTILITY_STATUS_SHUTDOWN = 4
}; };
enum DialogStockButton enum DialogStockButton

18
Core/Dialog/PSPMsgDialog.h
View File

@ -76,15 +76,15 @@ private :
enum Flags enum Flags
{ {
DS_MSG = 0x1, DS_MSG = 0x1,
DS_ERRORMSG = 0x2, DS_ERRORMSG = 0x2,
DS_YESNO = 0x4, DS_YESNO = 0x4,
DS_DEFNO = 0x8, DS_DEFNO = 0x8,
DS_OK = 0x10, DS_OK = 0x10,
DS_VALIDBUTTON = 0x20, DS_VALIDBUTTON = 0x20,
DS_CANCELBUTTON = 0x40, DS_CANCELBUTTON = 0x40,
DS_NOSOUND = 0x80, DS_NOSOUND = 0x80,
DS_ERROR = 0x100 DS_ERROR = 0x100
}; };
u32 flag; u32 flag;

74
Core/Dialog/PSPOskDialog.h
View File

@ -27,17 +27,17 @@
*/ */
enum SceUtilityOskInputLanguage enum SceUtilityOskInputLanguage
{ {
PSP_UTILITY_OSK_LANGUAGE_DEFAULT = 0x00, PSP_UTILITY_OSK_LANGUAGE_DEFAULT = 0x00,
PSP_UTILITY_OSK_LANGUAGE_JAPANESE = 0x01, PSP_UTILITY_OSK_LANGUAGE_JAPANESE = 0x01,
PSP_UTILITY_OSK_LANGUAGE_ENGLISH = 0x02, PSP_UTILITY_OSK_LANGUAGE_ENGLISH = 0x02,
PSP_UTILITY_OSK_LANGUAGE_FRENCH = 0x03, PSP_UTILITY_OSK_LANGUAGE_FRENCH = 0x03,
PSP_UTILITY_OSK_LANGUAGE_SPANISH = 0x04, PSP_UTILITY_OSK_LANGUAGE_SPANISH = 0x04,
PSP_UTILITY_OSK_LANGUAGE_GERMAN = 0x05, PSP_UTILITY_OSK_LANGUAGE_GERMAN = 0x05,
PSP_UTILITY_OSK_LANGUAGE_ITALIAN = 0x06, PSP_UTILITY_OSK_LANGUAGE_ITALIAN = 0x06,
PSP_UTILITY_OSK_LANGUAGE_DUTCH = 0x07, PSP_UTILITY_OSK_LANGUAGE_DUTCH = 0x07,
PSP_UTILITY_OSK_LANGUAGE_PORTUGESE = 0x08, PSP_UTILITY_OSK_LANGUAGE_PORTUGESE = 0x08,
PSP_UTILITY_OSK_LANGUAGE_RUSSIAN = 0x09, PSP_UTILITY_OSK_LANGUAGE_RUSSIAN = 0x09,
PSP_UTILITY_OSK_LANGUAGE_KOREAN = 0x0a PSP_UTILITY_OSK_LANGUAGE_KOREAN = 0x0a
}; };
/** /**
@ -45,12 +45,12 @@ enum SceUtilityOskInputLanguage
*/ */
enum SceUtilityOskState enum SceUtilityOskState
{ {
PSP_UTILITY_OSK_DIALOG_NONE = 0, /**< No OSK is currently active */ PSP_UTILITY_OSK_DIALOG_NONE = 0, /**< No OSK is currently active */
PSP_UTILITY_OSK_DIALOG_INITING, /**< The OSK is currently being initialized */ PSP_UTILITY_OSK_DIALOG_INITING = 1, /**< The OSK is currently being initialized */
PSP_UTILITY_OSK_DIALOG_INITED, /**< The OSK is initialised */ PSP_UTILITY_OSK_DIALOG_INITED = 2, /**< The OSK is initialised */
PSP_UTILITY_OSK_DIALOG_VISIBLE, /**< The OSK is visible and ready for use */ PSP_UTILITY_OSK_DIALOG_VISIBLE = 3, /**< The OSK is visible and ready for use */
PSP_UTILITY_OSK_DIALOG_QUIT, /**< The OSK has been cancelled and should be shut down */ PSP_UTILITY_OSK_DIALOG_QUIT = 4, /**< The OSK has been cancelled and should be shut down */
PSP_UTILITY_OSK_DIALOG_FINISHED /**< The OSK has successfully shut down */ PSP_UTILITY_OSK_DIALOG_FINISHED = 5 /**< The OSK has successfully shut down */
}; };
/** /**
@ -58,9 +58,9 @@ enum SceUtilityOskState
*/ */
enum SceUtilityOskResult enum SceUtilityOskResult
{ {
PSP_UTILITY_OSK_RESULT_UNCHANGED = 0, PSP_UTILITY_OSK_RESULT_UNCHANGED = 0,
PSP_UTILITY_OSK_RESULT_CANCELLED, PSP_UTILITY_OSK_RESULT_CANCELLED = 1,
PSP_UTILITY_OSK_RESULT_CHANGED PSP_UTILITY_OSK_RESULT_CHANGED = 2
}; };
/** /**
@ -68,27 +68,27 @@ enum SceUtilityOskResult
*/ */
enum SceUtilityOskInputType enum SceUtilityOskInputType
{ {
PSP_UTILITY_OSK_INPUTTYPE_ALL = 0x00000000, PSP_UTILITY_OSK_INPUTTYPE_ALL = 0x00000000,
PSP_UTILITY_OSK_INPUTTYPE_LATIN_DIGIT = 0x00000001, PSP_UTILITY_OSK_INPUTTYPE_LATIN_DIGIT = 0x00000001,
PSP_UTILITY_OSK_INPUTTYPE_LATIN_SYMBOL = 0x00000002, PSP_UTILITY_OSK_INPUTTYPE_LATIN_SYMBOL = 0x00000002,
PSP_UTILITY_OSK_INPUTTYPE_LATIN_LOWERCASE = 0x00000004, PSP_UTILITY_OSK_INPUTTYPE_LATIN_LOWERCASE = 0x00000004,
PSP_UTILITY_OSK_INPUTTYPE_LATIN_UPPERCASE = 0x00000008, PSP_UTILITY_OSK_INPUTTYPE_LATIN_UPPERCASE = 0x00000008,
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_DIGIT = 0x00000100, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_DIGIT = 0x00000100,
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_SYMBOL = 0x00000200, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_SYMBOL = 0x00000200,
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_LOWERCASE = 0x00000400, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_LOWERCASE = 0x00000400,
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_UPPERCASE = 0x00000800, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_UPPERCASE = 0x00000800,
// http://en.wikipedia.org/wiki/Hiragana // http://en.wikipedia.org/wiki/Hiragana
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_HIRAGANA = 0x00001000, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_HIRAGANA = 0x00001000,
// http://en.wikipedia.org/wiki/Katakana // http://en.wikipedia.org/wiki/Katakana
// Half-width Katakana // Half-width Katakana
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_HALF_KATAKANA = 0x00002000, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_HALF_KATAKANA = 0x00002000,
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_KATAKANA = 0x00004000, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_KATAKANA = 0x00004000,
// http://en.wikipedia.org/wiki/Kanji // http://en.wikipedia.org/wiki/Kanji
PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_KANJI = 0x00008000, PSP_UTILITY_OSK_INPUTTYPE_JAPANESE_KANJI = 0x00008000,
PSP_UTILITY_OSK_INPUTTYPE_RUSSIAN_LOWERCASE = 0x00010000, PSP_UTILITY_OSK_INPUTTYPE_RUSSIAN_LOWERCASE = 0x00010000,
PSP_UTILITY_OSK_INPUTTYPE_RUSSIAN_UPPERCASE = 0x00020000, PSP_UTILITY_OSK_INPUTTYPE_RUSSIAN_UPPERCASE = 0x00020000,
PSP_UTILITY_OSK_INPUTTYPE_KOREAN = 0x00040000, PSP_UTILITY_OSK_INPUTTYPE_KOREAN = 0x00040000,
PSP_UTILITY_OSK_INPUTTYPE_URL = 0x00080000 PSP_UTILITY_OSK_INPUTTYPE_URL = 0x00080000
}; };
#if COMMON_LITTLE_ENDIAN #if COMMON_LITTLE_ENDIAN

64
Core/Dialog/PSPSaveDialog.h
View File

@ -20,47 +20,47 @@
#include "PSPDialog.h" #include "PSPDialog.h"
#include "SavedataParam.h" #include "SavedataParam.h"
#define SCE_UTILITY_SAVEDATA_ERROR_TYPE (0x80110300) #define SCE_UTILITY_SAVEDATA_ERROR_TYPE (0x80110300)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_MS (0x80110301) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_MS (0x80110301)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_EJECT_MS (0x80110302) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_EJECT_MS (0x80110302)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_ACCESS_ERROR (0x80110305) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_ACCESS_ERROR (0x80110305)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_DATA_BROKEN (0x80110306) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_DATA_BROKEN (0x80110306)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_DATA (0x80110307) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_NO_DATA (0x80110307)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_PARAM (0x80110308) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_PARAM (0x80110308)
#define SCE_UTILITY_SAVEDATA_ERROR_LOAD_INTERNAL (0x8011030b) #define SCE_UTILITY_SAVEDATA_ERROR_LOAD_INTERNAL (0x8011030b)
#define SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK (0x80110321) #define SCE_UTILITY_SAVEDATA_ERROR_RW_NO_MEMSTICK (0x80110321)
#define SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA (0x80110327) #define SCE_UTILITY_SAVEDATA_ERROR_RW_NO_DATA (0x80110327)
#define SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_PARAMS (0x80110328) #define SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_PARAMS (0x80110328)
#define SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS (0x8011032c) #define SCE_UTILITY_SAVEDATA_ERROR_RW_BAD_STATUS (0x8011032c)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_MS (0x80110381) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_MS (0x80110381)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_EJECT_MS (0x80110382) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_EJECT_MS (0x80110382)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE (0x80110383) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_NOSPACE (0x80110383)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_PROTECTED (0x80110384) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_MS_PROTECTED (0x80110384)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_ACCESS_ERROR (0x80110385) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_ACCESS_ERROR (0x80110385)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_PARAM (0x80110388) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_PARAM (0x80110388)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_UMD (0x80110389) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_NO_UMD (0x80110389)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_WRONG_UMD (0x8011038a) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_WRONG_UMD (0x8011038a)
#define SCE_UTILITY_SAVEDATA_ERROR_SAVE_INTERNAL (0x8011038b) #define SCE_UTILITY_SAVEDATA_ERROR_SAVE_INTERNAL (0x8011038b)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_MS (0x80110341) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_MS (0x80110341)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_EJECT_MS (0x80110342) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_EJECT_MS (0x80110342)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_MS_PROTECTED (0x80110344) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_MS_PROTECTED (0x80110344)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_ACCESS_ERROR (0x80110345) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_ACCESS_ERROR (0x80110345)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_DATA (0x80110347) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_NO_DATA (0x80110347)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_PARAM (0x80110348) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_PARAM (0x80110348)
#define SCE_UTILITY_SAVEDATA_ERROR_DELETE_INTERNAL (0x8011034b) #define SCE_UTILITY_SAVEDATA_ERROR_DELETE_INTERNAL (0x8011034b)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_MS (0x801103C1) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_MS (0x801103C1)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_EJECT_MS (0x801103C2) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_EJECT_MS (0x801103C2)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_ACCESS_ERROR (0x801103C5) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_ACCESS_ERROR (0x801103C5)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_DATA (0x801103C7) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_DATA (0x801103C7)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_PARAM (0x801103C8) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_PARAM (0x801103C8)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_UMD (0x801103C9) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_NO_UMD (0x801103C9)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_WRONG_UMD (0x801103Ca) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_WRONG_UMD (0x801103Ca)
#define SCE_UTILITY_SAVEDATA_ERROR_SIZES_INTERNAL (0x801103Cb) #define SCE_UTILITY_SAVEDATA_ERROR_SIZES_INTERNAL (0x801103Cb)
class PSPSaveDialog: public PSPDialog { class PSPSaveDialog: public PSPDialog {
public: public:

32
Core/ELF/ElfTypes.h
View File

@ -25,27 +25,27 @@
// File type // File type
enum ElfType enum ElfType
{ {
ET_NONE =0, ET_NONE = 0,
ET_REL =1, ET_REL = 1,
ET_EXEC =2, ET_EXEC = 2,
ET_DYN =3, ET_DYN = 3,
ET_CORE =4, ET_CORE = 4,
ET_LOPROC =0xFF00, ET_LOPROC = 0xFF00,
ET_HIPROC =0xFFFF, ET_HIPROC = 0xFFFF,
ET_PSP_PRX=0xFFA0, ET_PSP_PRX = 0xFFA0,
}; };
// Machine/Architecture // Machine/Architecture
enum ElfMachine enum ElfMachine
{ {
EM_NONE =0, EM_NONE = 0,
EM_M32 =1, EM_M32 = 1,
EM_SPARC =2, EM_SPARC = 2,
EM_386 =3, EM_386 = 3,
EM_68K =4, EM_68K = 4,
EM_88K =5, EM_88K = 5,
EM_860 =7, EM_860 = 7,
EM_MIPS =8 EM_MIPS = 8
}; };
// File version // File version

58
Core/ELF/PrxDecrypter.h
View File

@ -27,35 +27,35 @@
#endif #endif
typedef struct typedef struct
{ {
u32_le signature; // 0 u32_le signature; // 0
u16_le attribute; // 4 modinfo u16_le attribute; // 4 modinfo
u16_le comp_attribute; // 6 u16_le comp_attribute; // 6
u8 module_ver_lo; // 8 u8 module_ver_lo; // 8
u8 module_ver_hi; // 9 u8 module_ver_hi; // 9
char modname[28]; // 0A char modname[28]; // 0A
u8 version; // 26 u8 version; // 26
u8 nsegments; // 27 u8 nsegments; // 27
u32_le elf_size; // 28 u32_le elf_size; // 28
u32_le psp_size; // 2C u32_le psp_size; // 2C
u32_le entry; // 30 u32_le entry; // 30
u32_le modinfo_offset; // 34 u32_le modinfo_offset; // 34
s32_le bss_size; // 38 s32_le bss_size; // 38
u16_le seg_align[4]; // 3C u16_le seg_align[4]; // 3C
u32_le seg_address[4]; // 44 u32_le seg_address[4]; // 44
s32_le seg_size[4]; // 54 s32_le seg_size[4]; // 54
u32_le reserved[5]; // 64 u32_le reserved[5]; // 64
u32_le devkitversion; // 78 u32_le devkitversion; // 78
u32_le decrypt_mode; // 7C u32_le decrypt_mode; // 7C
u8 key_data0[0x30]; // 80 u8 key_data0[0x30]; // 80
s32_le comp_size; // B0 s32_le comp_size; // B0
s32_le _80; // B4 s32_le _80; // B4
s32_le reserved2[2]; // B8 s32_le reserved2[2]; // B8
u8 key_data1[0x10]; // C0 u8 key_data1[0x10]; // C0
u32_le tag; // D0 u32_le tag; // D0
u8 scheck[0x58]; // D4 u8 scheck[0x58]; // D4
u32_le key_data2; // 12C u32_le key_data2; // 12C
u32_le oe_tag; // 130 u32_le oe_tag; // 130
u8 key_data3[0x1C]; // 134 u8 key_data3[0x1C]; // 134
#ifdef _MSC_VER #ifdef _MSC_VER
} PSP_Header; } PSP_Header;
#else #else

22
Core/FileSystems/FileSystem.h
View File

@ -22,25 +22,25 @@
enum FileAccess enum FileAccess
{ {
FILEACCESS_NONE=0, FILEACCESS_NONE = 0,
FILEACCESS_READ=1, FILEACCESS_READ = 1,
FILEACCESS_WRITE=2, FILEACCESS_WRITE = 2,
FILEACCESS_APPEND=4, FILEACCESS_APPEND = 4,
FILEACCESS_CREATE=8, FILEACCESS_CREATE = 8,
FILEACCESS_TRUNCATE=16, FILEACCESS_TRUNCATE = 16,
}; };
enum FileMove enum FileMove
{ {
FILEMOVE_BEGIN=0, FILEMOVE_BEGIN = 0,
FILEMOVE_CURRENT=1, FILEMOVE_CURRENT = 1,
FILEMOVE_END=2 FILEMOVE_END = 2
}; };
enum FileType enum FileType
{ {
FILETYPE_NORMAL=1, FILETYPE_NORMAL = 1,
FILETYPE_DIRECTORY=2 FILETYPE_DIRECTORY = 2
}; };
enum DevType enum DevType

12
Core/Font/PGF.h
View File

@ -65,11 +65,11 @@ enum Language {
}; };
enum FontPixelFormat { enum FontPixelFormat {
PSP_FONT_PIXELFORMAT_4 = 0, // 2 pixels packed in 1 byte (natural order) PSP_FONT_PIXELFORMAT_4 = 0, // 2 pixels packed in 1 byte (natural order)
PSP_FONT_PIXELFORMAT_4_REV = 1, // 2 pixels packed in 1 byte (reversed order) PSP_FONT_PIXELFORMAT_4_REV = 1, // 2 pixels packed in 1 byte (reversed order)
PSP_FONT_PIXELFORMAT_8 = 2, // 1 pixel in 1 byte PSP_FONT_PIXELFORMAT_8 = 2, // 1 pixel in 1 byte
PSP_FONT_PIXELFORMAT_24 = 3, // 1 pixel in 3 bytes (RGB) PSP_FONT_PIXELFORMAT_24 = 3, // 1 pixel in 3 bytes (RGB)
PSP_FONT_PIXELFORMAT_32 = 4, // 1 pixel in 4 bytes (RGBA) PSP_FONT_PIXELFORMAT_32 = 4, // 1 pixel in 4 bytes (RGBA)
}; };
@ -86,8 +86,8 @@ struct PGFFontStyle {
u16_le fontLanguage; u16_le fontLanguage;
u16_le fontRegion; u16_le fontRegion;
u16_le fontCountry; u16_le fontCountry;
char fontName[64]; char fontName[64];
char fontFileName[64]; char fontFileName[64];
u32_le fontAttributes; u32_le fontAttributes;
u32_le fontExpire; u32_le fontExpire;
}; };

12
Core/HLE/HLE.cpp
View File

@ -43,21 +43,21 @@
enum enum
{ {
// Do nothing after the syscall. // Do nothing after the syscall.
HLE_AFTER_NOTHING = 0x00, HLE_AFTER_NOTHING = 0x00,
// Reschedule immediately after the syscall. // Reschedule immediately after the syscall.
HLE_AFTER_RESCHED = 0x01, HLE_AFTER_RESCHED = 0x01,
// Call current thread's callbacks after the syscall. // Call current thread's callbacks after the syscall.
HLE_AFTER_CURRENT_CALLBACKS = 0x02, HLE_AFTER_CURRENT_CALLBACKS = 0x02,
// Check all threads' callbacks after the syscall. // Check all threads' callbacks after the syscall.
HLE_AFTER_ALL_CALLBACKS = 0x04, HLE_AFTER_ALL_CALLBACKS = 0x04,
// Reschedule and process current thread's callbacks after the syscall. // Reschedule and process current thread's callbacks after the syscall.
HLE_AFTER_RESCHED_CALLBACKS = 0x08, HLE_AFTER_RESCHED_CALLBACKS = 0x08,
// Run interrupts (and probably reschedule) after the syscall. // Run interrupts (and probably reschedule) after the syscall.
HLE_AFTER_RUN_INTERRUPTS = 0x10, HLE_AFTER_RUN_INTERRUPTS = 0x10,
// Switch to CORE_STEPPING after the syscall (for debugging.) // Switch to CORE_STEPPING after the syscall (for debugging.)
HLE_AFTER_DEBUG_BREAK = 0x20, HLE_AFTER_DEBUG_BREAK = 0x20,
// Don't fill temp regs with 0xDEADBEEF. // Don't fill temp regs with 0xDEADBEEF.
HLE_AFTER_SKIP_DEADBEEF = 0x40, HLE_AFTER_SKIP_DEADBEEF = 0x40,
}; };
typedef std::vector<Syscall> SyscallVector; typedef std::vector<Syscall> SyscallVector;

16
Core/HLE/sceAtrac.cpp
View File

@ -50,15 +50,15 @@
#define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023 #define ATRAC_ERROR_BUFFER_IS_EMPTY 0x80630023
#define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024 #define ATRAC_ERROR_ALL_DATA_DECODED 0x80630024
#define AT3_MAGIC 0x0270 #define AT3_MAGIC 0x0270
#define AT3_PLUS_MAGIC 0xFFFE #define AT3_PLUS_MAGIC 0xFFFE
#define PSP_MODE_AT_3_PLUS 0x00001000 #define PSP_MODE_AT_3_PLUS 0x00001000
#define PSP_MODE_AT_3 0x00001001 #define PSP_MODE_AT_3 0x00001001
const int FMT_CHUNK_MAGIC = 0x20746D66; const int FMT_CHUNK_MAGIC = 0x20746D66;
const int DATA_CHUNK_MAGIC = 0x61746164; const int DATA_CHUNK_MAGIC = 0x61746164;
const int SMPL_CHUNK_MAGIC = 0x6C706D73; const int SMPL_CHUNK_MAGIC = 0x6C706D73;
const int FACT_CHUNK_MAGIC = 0x74636166; const int FACT_CHUNK_MAGIC = 0x74636166;
const int PSP_ATRAC_ALLDATA_IS_ON_MEMORY = -1; const int PSP_ATRAC_ALLDATA_IS_ON_MEMORY = -1;
const int PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY = -2; const int PSP_ATRAC_NONLOOP_STREAM_DATA_IS_ON_MEMORY = -2;

10
Core/HLE/sceAudio.h
View File

@ -25,8 +25,8 @@
class PointerWrap; class PointerWrap;
enum PspAudioFormats { PSP_AUDIO_FORMAT_STEREO = 0, PSP_AUDIO_FORMAT_MONO = 0x10 }; enum PspAudioFormats { PSP_AUDIO_FORMAT_STEREO = 0, PSP_AUDIO_FORMAT_MONO = 0x10 };
enum PspAudioFrequencies { PSP_AUDIO_FREQ_44K = 44100, PSP_AUDIO_FREQ_48K = 48000 }; enum PspAudioFrequencies { PSP_AUDIO_FREQ_44K = 44100, PSP_AUDIO_FREQ_48K = 48000 };
#define SCE_ERROR_AUDIO_CHANNEL_NOT_INIT 0x80260001 #define SCE_ERROR_AUDIO_CHANNEL_NOT_INIT 0x80260001
#define SCE_ERROR_AUDIO_CHANNEL_BUSY 0x80260002 #define SCE_ERROR_AUDIO_CHANNEL_BUSY 0x80260002
@ -37,9 +37,9 @@ enum PspAudioFrequencies { PSP_AUDIO_FREQ_44K = 44100, PSP_AUDIO_FREQ_48K = 48
#define SCE_ERROR_AUDIO_INVALID_FORMAT 0x80260007 #define SCE_ERROR_AUDIO_INVALID_FORMAT 0x80260007
#define SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED 0x80260008 #define SCE_ERROR_AUDIO_CHANNEL_NOT_RESERVED 0x80260008
#define SCE_ERROR_AUDIO_NOT_OUTPUT 0x80260009 #define SCE_ERROR_AUDIO_NOT_OUTPUT 0x80260009
#define SCE_ERROR_AUDIO_INVALID_FREQUENCY 0x8026000A #define SCE_ERROR_AUDIO_INVALID_FREQUENCY 0x8026000A
#define SCE_ERROR_AUDIO_INVALID_VOLUME 0x8026000B #define SCE_ERROR_AUDIO_INVALID_VOLUME 0x8026000B
#define SCE_ERROR_AUDIO_CHANNEL_ALREADY_RESERVED 0x80268002 #define SCE_ERROR_AUDIO_CHANNEL_ALREADY_RESERVED 0x80268002
const u32 PSP_AUDIO_CHANNEL_MAX = 8; const u32 PSP_AUDIO_CHANNEL_MAX = 8;

10
Core/HLE/sceChnnlsv.h
View File

@ -19,19 +19,19 @@
typedef struct _pspChnnlsvContext1 { typedef struct _pspChnnlsvContext1 {
/** Cipher mode */ /** Cipher mode */
s32_le mode; s32_le mode;
/** Context data */ /** Context data */
u8 result[0x10]; u8 result[0x10];
u8 key[0x10]; u8 key[0x10];
s32_le keyLength; s32_le keyLength;
} pspChnnlsvContext1; } pspChnnlsvContext1;
typedef struct _pspChnnlsvContext2 { typedef struct _pspChnnlsvContext2 {
/** Context data */ /** Context data */
s32_le mode; s32_le mode;
s32_le unkn; s32_le unkn;
u8 cryptedData[0x92]; u8 cryptedData[0x92];
} pspChnnlsvContext2; } pspChnnlsvContext2;
int sceSdSetIndex_(pspChnnlsvContext1& ctx, int value); int sceSdSetIndex_(pspChnnlsvContext1& ctx, int value);

58
Core/HLE/sceFont.cpp
View File

@ -19,17 +19,17 @@
#include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelThread.h"
enum { enum {
ERROR_FONT_OUT_OF_MEMORY = 0x80460001, ERROR_FONT_OUT_OF_MEMORY = 0x80460001,
ERROR_FONT_INVALID_LIBID = 0x80460002, ERROR_FONT_INVALID_LIBID = 0x80460002,
ERROR_FONT_INVALID_PARAMETER = 0x80460003, ERROR_FONT_INVALID_PARAMETER = 0x80460003,
ERROR_FONT_HANDLER_OPEN_FAILED = 0x80460005, ERROR_FONT_HANDLER_OPEN_FAILED = 0x80460005,
ERROR_FONT_TOO_MANY_OPEN_FONTS = 0x80460009, ERROR_FONT_TOO_MANY_OPEN_FONTS = 0x80460009,
ERROR_FONT_INVALID_FONT_DATA = 0x8046000a, ERROR_FONT_INVALID_FONT_DATA = 0x8046000a,
}; };
enum { enum {
FONT_IS_CLOSED = 0, FONT_IS_CLOSED = 0,
FONT_IS_OPEN = 1, FONT_IS_OPEN = 1,
}; };
// Actions // Actions
@ -126,13 +126,13 @@ enum MatchQuality {
}; };
enum FontOpenMode { enum FontOpenMode {
FONT_OPEN_INTERNAL_STINGY = 0, FONT_OPEN_INTERNAL_STINGY = 0,
FONT_OPEN_INTERNAL_FULL = 1, FONT_OPEN_INTERNAL_FULL = 1,
// Calls open/seek/read/close handlers to read the file partially. // Calls open/seek/read/close handlers to read the file partially.
FONT_OPEN_USERFILE_HANDLERS = 2, FONT_OPEN_USERFILE_HANDLERS = 2,
// Reads directly from filesystem. // Reads directly from filesystem.
FONT_OPEN_USERFILE_FULL = 3, FONT_OPEN_USERFILE_FULL = 3,
FONT_OPEN_USERBUFFER = 4, FONT_OPEN_USERBUFFER = 4,
}; };
// TODO: Merge this class with PGF? That'd make it harder to support .bwfon // TODO: Merge this class with PGF? That'd make it harder to support .bwfon
@ -1324,30 +1324,30 @@ int sceFontGetShadowGlyphImage_Clip(u32 fontHandle, u32 charCode, u32 glyphImage
} }
const HLEFunction sceLibFont[] = { const HLEFunction sceLibFont[] = {
{0x67f17ed7, WrapU_UU<sceFontNewLib>, "sceFontNewLib"}, {0x67f17ed7, WrapU_UU<sceFontNewLib>, "sceFontNewLib"},
{0x574b6fbc, WrapI_U<sceFontDoneLib>, "sceFontDoneLib"}, {0x574b6fbc, WrapI_U<sceFontDoneLib>, "sceFontDoneLib"},
{0x48293280, WrapI_UFF<sceFontSetResolution>, "sceFontSetResolution"}, {0x48293280, WrapI_UFF<sceFontSetResolution>, "sceFontSetResolution"},
{0x27f6e642, WrapI_UU<sceFontGetNumFontList>, "sceFontGetNumFontList"}, {0x27f6e642, WrapI_UU<sceFontGetNumFontList>, "sceFontGetNumFontList"},
{0xbc75d85b, WrapI_UUI<sceFontGetFontList>, "sceFontGetFontList"}, {0xbc75d85b, WrapI_UUI<sceFontGetFontList>, "sceFontGetFontList"},
{0x099ef33c, WrapI_UUU<sceFontFindOptimumFont>, "sceFontFindOptimumFont"}, {0x099ef33c, WrapI_UUU<sceFontFindOptimumFont>, "sceFontFindOptimumFont"},
{0x681e61a7, WrapI_UUU<sceFontFindFont>, "sceFontFindFont"}, {0x681e61a7, WrapI_UUU<sceFontFindFont>, "sceFontFindFont"},
{0x2f67356a, WrapI_V<sceFontCalcMemorySize>, "sceFontCalcMemorySize"}, {0x2f67356a, WrapI_V<sceFontCalcMemorySize>, "sceFontCalcMemorySize"},
{0x5333322d, WrapI_UUU<sceFontGetFontInfoByIndexNumber>, "sceFontGetFontInfoByIndexNumber"}, {0x5333322d, WrapI_UUU<sceFontGetFontInfoByIndexNumber>, "sceFontGetFontInfoByIndexNumber"},
{0xa834319d, WrapU_UUUU<sceFontOpen>, "sceFontOpen"}, {0xa834319d, WrapU_UUUU<sceFontOpen>, "sceFontOpen"},
{0x57fcb733, WrapU_UCUU<sceFontOpenUserFile>, "sceFontOpenUserFile"}, {0x57fcb733, WrapU_UCUU<sceFontOpenUserFile>, "sceFontOpenUserFile"},
{0xbb8e7fe6, WrapU_UUUU<sceFontOpenUserMemory>, "sceFontOpenUserMemory"}, {0xbb8e7fe6, WrapU_UUUU<sceFontOpenUserMemory>, "sceFontOpenUserMemory"},
{0x3aea8cb6, WrapI_U<sceFontClose>, "sceFontClose"}, {0x3aea8cb6, WrapI_U<sceFontClose>, "sceFontClose"},
{0x0da7535e, WrapI_UU<sceFontGetFontInfo>, "sceFontGetFontInfo"}, {0x0da7535e, WrapI_UU<sceFontGetFontInfo>, "sceFontGetFontInfo"},
{0xdcc80c2f, WrapI_UUU<sceFontGetCharInfo>, "sceFontGetCharInfo"}, {0xdcc80c2f, WrapI_UUU<sceFontGetCharInfo>, "sceFontGetCharInfo"},
{0xaa3de7b5, WrapI_UUU<sceFontGetShadowInfo>, "sceFontGetShadowInfo"}, {0xaa3de7b5, WrapI_UUU<sceFontGetShadowInfo>, "sceFontGetShadowInfo"},
{0x5c3e4a9e, WrapI_UUU<sceFontGetCharImageRect>, "sceFontGetCharImageRect"}, {0x5c3e4a9e, WrapI_UUU<sceFontGetCharImageRect>, "sceFontGetCharImageRect"},
{0x48b06520, WrapI_UUU<sceFontGetShadowImageRect>, "sceFontGetShadowImageRect"}, {0x48b06520, WrapI_UUU<sceFontGetShadowImageRect>, "sceFontGetShadowImageRect"},
{0x980f4895, WrapI_UUU<sceFontGetCharGlyphImage>, "sceFontGetCharGlyphImage"}, {0x980f4895, WrapI_UUU<sceFontGetCharGlyphImage>, "sceFontGetCharGlyphImage"},
{0xca1e6945, WrapI_UUUIIII<sceFontGetCharGlyphImage_Clip>, "sceFontGetCharGlyphImage_Clip"}, {0xca1e6945, WrapI_UUUIIII<sceFontGetCharGlyphImage_Clip>, "sceFontGetCharGlyphImage_Clip"},
{0x74b21701, WrapF_IFU<sceFontPixelToPointH>, "sceFontPixelToPointH"}, {0x74b21701, WrapF_IFU<sceFontPixelToPointH>, "sceFontPixelToPointH"},
{0xf8f0752e, WrapF_IFU<sceFontPixelToPointV>, "sceFontPixelToPointV"}, {0xf8f0752e, WrapF_IFU<sceFontPixelToPointV>, "sceFontPixelToPointV"},
{0x472694cd, WrapF_IFU<sceFontPointToPixelH>, "sceFontPointToPixelH"}, {0x472694cd, WrapF_IFU<sceFontPointToPixelH>, "sceFontPointToPixelH"},
{0x3c4b7e82, WrapF_IFU<sceFontPointToPixelV>, "sceFontPointToPixelV"}, {0x3c4b7e82, WrapF_IFU<sceFontPointToPixelV>, "sceFontPointToPixelV"},
{0xee232411, WrapI_UU<sceFontSetAltCharacterCode>, "sceFontSetAltCharacterCode"}, {0xee232411, WrapI_UU<sceFontSetAltCharacterCode>, "sceFontSetAltCharacterCode"},
{0x568be516, WrapI_UUU<sceFontGetShadowGlyphImage>, "sceFontGetShadowGlyphImage"}, {0x568be516, WrapI_UUU<sceFontGetShadowGlyphImage>, "sceFontGetShadowGlyphImage"},
{0x5dcf6858, WrapI_UUUIIII<sceFontGetShadowGlyphImage_Clip>, "sceFontGetShadowGlyphImage_Clip"}, {0x5dcf6858, WrapI_UUUIIII<sceFontGetShadowGlyphImage_Clip>, "sceFontGetShadowGlyphImage_Clip"},

10
Core/HLE/sceGe.h
View File

@ -19,11 +19,11 @@
#include "Core/HLE/sceKernelThread.h" #include "Core/HLE/sceKernelThread.h"
#define SCE_GE_LIST_COMPLETED 0 #define SCE_GE_LIST_COMPLETED 0
#define SCE_GE_LIST_QUEUED 1 #define SCE_GE_LIST_QUEUED 1
#define SCE_GE_LIST_DRAWING 2 #define SCE_GE_LIST_DRAWING 2
#define SCE_GE_LIST_STALLING 3 #define SCE_GE_LIST_STALLING 3
#define SCE_GE_LIST_PAUSED 4 #define SCE_GE_LIST_PAUSED 4
// typedef void (*PspGeCallback)(int id, void *arg); // typedef void (*PspGeCallback)(int id, void *arg);

6
Core/HLE/sceImpose.cpp
View File

@ -25,9 +25,9 @@
const int PSP_UMD_POPUP_DISABLE = 0; const int PSP_UMD_POPUP_DISABLE = 0;
const int PSP_UMD_POPUP_ENABLE = 1; const int PSP_UMD_POPUP_ENABLE = 1;
#define PSP_IMPOSE_BATTICON_NONE 0x80000000 #define PSP_IMPOSE_BATTICON_NONE 0x80000000
#define PSP_IMPOSE_BATTICON_VISIBLE 0x00000000 #define PSP_IMPOSE_BATTICON_VISIBLE 0x00000000
#define PSP_IMPOSE_BATTICON_BLINK 0x00000001 #define PSP_IMPOSE_BATTICON_BLINK 0x00000001
static u32 language = PSP_SYSTEMPARAM_LANGUAGE_ENGLISH; static u32 language = PSP_SYSTEMPARAM_LANGUAGE_ENGLISH;
static u32 buttonValue = PSP_SYSTEMPARAM_BUTTON_CIRCLE; static u32 buttonValue = PSP_SYSTEMPARAM_BUTTON_CIRCLE;

24
Core/HLE/sceIo.cpp
View File

@ -57,9 +57,9 @@ const int ERROR_ERRNO_IO_ERROR = 0x80010005;
const int ERROR_ERRNO_FILE_ALREADY_EXISTS = 0x80010011; const int ERROR_ERRNO_FILE_ALREADY_EXISTS = 0x80010011;
const int ERROR_MEMSTICK_DEVCTL_BAD_PARAMS = 0x80220081; const int ERROR_MEMSTICK_DEVCTL_BAD_PARAMS = 0x80220081;
const int ERROR_MEMSTICK_DEVCTL_TOO_MANY_CALLBACKS = 0x80220082; const int ERROR_MEMSTICK_DEVCTL_TOO_MANY_CALLBACKS = 0x80220082;
const int ERROR_KERNEL_BAD_FILE_DESCRIPTOR = 0x80020323; const int ERROR_KERNEL_BAD_FILE_DESCRIPTOR = 0x80020323;
const int ERROR_PGD_INVALID_HEADER = 0x80510204; const int ERROR_PGD_INVALID_HEADER = 0x80510204;
/* /*
@ -81,14 +81,14 @@ umd00: block access - umd
umd01: block access - umd umd01: block access - umd
*/ */
#define O_RDONLY 0x0001 #define O_RDONLY 0x0001
#define O_WRONLY 0x0002 #define O_WRONLY 0x0002
#define O_RDWR 0x0003 #define O_RDWR 0x0003
#define O_NBLOCK 0x0010 #define O_NBLOCK 0x0010
#define O_APPEND 0x0100 #define O_APPEND 0x0100
#define O_CREAT 0x0200 #define O_CREAT 0x0200
#define O_TRUNC 0x0400 #define O_TRUNC 0x0400
#define O_NOWAIT 0x8000 #define O_NOWAIT 0x8000
#define O_NPDRM 0x40000000 #define O_NPDRM 0x40000000
// chstat // chstat
@ -128,8 +128,8 @@ const int IO_THREAD_MIN_DATA_SIZE = 0;
#define SCE_STM_FLNK 0x4000 #define SCE_STM_FLNK 0x4000
enum { enum {
TYPE_DIR=0x10, TYPE_DIR = 0x10,
TYPE_FILE=0x20 TYPE_FILE = 0x20
}; };
#ifdef __SYMBIAN32__ #ifdef __SYMBIAN32__

76
Core/HLE/sceKernel.h
View File

@ -26,23 +26,23 @@ class PointerWrap;
enum enum
{ {
SCE_KERNEL_ERROR_OK = 0, SCE_KERNEL_ERROR_OK = 0,
SCE_KERNEL_ERROR_ALREADY = 0x80000020, SCE_KERNEL_ERROR_ALREADY = 0x80000020,
SCE_KERNEL_ERROR_BUSY = 0x80000021, SCE_KERNEL_ERROR_BUSY = 0x80000021,
SCE_KERNEL_ERROR_OUT_OF_MEMORY = 0x80000022, SCE_KERNEL_ERROR_OUT_OF_MEMORY = 0x80000022,
SCE_KERNEL_ERROR_INVALID_ID = 0x80000100, SCE_KERNEL_ERROR_INVALID_ID = 0x80000100,
SCE_KERNEL_ERROR_INVALID_NAME = 0x80000101, SCE_KERNEL_ERROR_INVALID_NAME = 0x80000101,
SCE_KERNEL_ERROR_INVALID_INDEX = 0x80000102, SCE_KERNEL_ERROR_INVALID_INDEX = 0x80000102,
SCE_KERNEL_ERROR_INVALID_POINTER = 0x80000103, SCE_KERNEL_ERROR_INVALID_POINTER = 0x80000103,
SCE_KERNEL_ERROR_INVALID_SIZE = 0x80000104, SCE_KERNEL_ERROR_INVALID_SIZE = 0x80000104,
SCE_KERNEL_ERROR_INVALID_FLAG = 0x80000105, SCE_KERNEL_ERROR_INVALID_FLAG = 0x80000105,
SCE_KERNEL_ERROR_INVALID_COMMAND = 0x80000106, SCE_KERNEL_ERROR_INVALID_COMMAND = 0x80000106,
SCE_KERNEL_ERROR_INVALID_MODE = 0x80000107, SCE_KERNEL_ERROR_INVALID_MODE = 0x80000107,
SCE_KERNEL_ERROR_INVALID_FORMAT = 0x80000108, SCE_KERNEL_ERROR_INVALID_FORMAT = 0x80000108,
SCE_KERNEL_ERROR_INVALID_VALUE = 0x800001FE, SCE_KERNEL_ERROR_INVALID_VALUE = 0x800001FE,
SCE_KERNEL_ERROR_INVALID_ARGUMENT = 0x800001FF, SCE_KERNEL_ERROR_INVALID_ARGUMENT = 0x800001FF,
SCE_KERNEL_ERROR_BAD_FILE = 0x80000209, SCE_KERNEL_ERROR_BAD_FILE = 0x80000209,
SCE_KERNEL_ERROR_ACCESS_ERROR = 0x8000020D, SCE_KERNEL_ERROR_ACCESS_ERROR = 0x8000020D,
SCE_KERNEL_ERROR_ERRNO_ARG_LIST_TOO_LONG = 0x80010007, SCE_KERNEL_ERROR_ERRNO_ARG_LIST_TOO_LONG = 0x80010007,
SCE_KERNEL_ERROR_ERRNO_INVALID_FILE_DESCRIPTOR = 0x80010009, SCE_KERNEL_ERROR_ERRNO_INVALID_FILE_DESCRIPTOR = 0x80010009,
@ -311,31 +311,31 @@ enum
// If you add to this, make sure to check KernelObjectPool::CreateByIDType(). // If you add to this, make sure to check KernelObjectPool::CreateByIDType().
enum TMIDPurpose enum TMIDPurpose
{ {
SCE_KERNEL_TMID_Thread = 1, SCE_KERNEL_TMID_Thread = 1,
SCE_KERNEL_TMID_Semaphore = 2, SCE_KERNEL_TMID_Semaphore = 2,
SCE_KERNEL_TMID_EventFlag = 3, SCE_KERNEL_TMID_EventFlag = 3,
SCE_KERNEL_TMID_Mbox = 4, SCE_KERNEL_TMID_Mbox = 4,
SCE_KERNEL_TMID_Vpl = 5, SCE_KERNEL_TMID_Vpl = 5,
SCE_KERNEL_TMID_Fpl = 6, SCE_KERNEL_TMID_Fpl = 6,
SCE_KERNEL_TMID_Mpipe = 7, SCE_KERNEL_TMID_Mpipe = 7,
SCE_KERNEL_TMID_Callback = 8, SCE_KERNEL_TMID_Callback = 8,
SCE_KERNEL_TMID_ThreadEventHandler = 9, SCE_KERNEL_TMID_ThreadEventHandler = 9,
SCE_KERNEL_TMID_Alarm = 10, SCE_KERNEL_TMID_Alarm = 10,
SCE_KERNEL_TMID_VTimer = 11, SCE_KERNEL_TMID_VTimer = 11,
SCE_KERNEL_TMID_Mutex = 12, SCE_KERNEL_TMID_Mutex = 12,
SCE_KERNEL_TMID_LwMutex = 13, SCE_KERNEL_TMID_LwMutex = 13,
SCE_KERNEL_TMID_SleepThread = 64, SCE_KERNEL_TMID_SleepThread = 64,
SCE_KERNEL_TMID_DelayThread = 65, SCE_KERNEL_TMID_DelayThread = 65,
SCE_KERNEL_TMID_SuspendThread = 66, SCE_KERNEL_TMID_SuspendThread = 66,
SCE_KERNEL_TMID_DormantThread = 67, SCE_KERNEL_TMID_DormantThread = 67,
// No idea what the correct value is here or how to find out. // No idea what the correct value is here or how to find out.
SCE_KERNEL_TMID_Tlspl = 0x1001, SCE_KERNEL_TMID_Tlspl = 0x1001,
// Not official, but need ids for save states. // Not official, but need ids for save states.
PPSSPP_KERNEL_TMID_Module = 0x100001, PPSSPP_KERNEL_TMID_Module = 0x100001,
PPSSPP_KERNEL_TMID_PMB = 0x100002, PPSSPP_KERNEL_TMID_PMB = 0x100002,
PPSSPP_KERNEL_TMID_File = 0x100003, PPSSPP_KERNEL_TMID_File = 0x100003,
PPSSPP_KERNEL_TMID_DirList = 0x100004, PPSSPP_KERNEL_TMID_DirList = 0x100004,
}; };
typedef int SceUID; typedef int SceUID;

34
Core/HLE/sceKernelInterrupt.cpp
View File

@ -524,23 +524,23 @@ u32 sceKernelDisableSubIntr(u32 intrNumber, u32 subIntrNumber)
struct PspIntrHandlerOptionParam { struct PspIntrHandlerOptionParam {
int size; //+00 int size; //+00
u32 entry; //+04 u32 entry; //+04
u32 common; //+08 u32 common; //+08
u32 gp; //+0C u32 gp; //+0C
u16 intr_code; //+10 u16 intr_code; //+10
u16 sub_count; //+12 u16 sub_count; //+12
u16 intr_level; //+14 u16 intr_level; //+14
u16 enabled; //+16 u16 enabled; //+16
u32 calls; //+18 u32 calls; //+18
u32 field_1C; //+1C u32 field_1C; //+1C
u32 total_clock_lo; //+20 u32 total_clock_lo; //+20
u32 total_clock_hi; //+24 u32 total_clock_hi; //+24
u32 min_clock_lo; //+28 u32 min_clock_lo; //+28
u32 min_clock_hi; //+2C u32 min_clock_hi; //+2C
u32 max_clock_lo; //+30 u32 max_clock_lo; //+30
u32 max_clock_hi; //+34 u32 max_clock_hi; //+34
} ; //=38 }; //=38
void QueryIntrHandlerInfo() void QueryIntrHandlerInfo()
{ {

28
Core/HLE/sceKernelMemory.cpp
View File

@ -47,8 +47,8 @@ static bool tlsplUsedIndexes[TLSPL_NUM_INDEXES];
// STATE END // STATE END
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
#define SCE_KERNEL_HASCOMPILEDSDKVERSION 0x1000 #define SCE_KERNEL_HASCOMPILEDSDKVERSION 0x1000
#define SCE_KERNEL_HASCOMPILERVERSION 0x2000 #define SCE_KERNEL_HASCOMPILERVERSION 0x2000
int flags_ = 0; int flags_ = 0;
int sdkVersion_; int sdkVersion_;
@ -474,10 +474,10 @@ void __KernelMemoryShutdown()
enum SceKernelFplAttr enum SceKernelFplAttr
{ {
PSP_FPL_ATTR_FIFO = 0x0000, PSP_FPL_ATTR_FIFO = 0x0000,
PSP_FPL_ATTR_PRIORITY = 0x0100, PSP_FPL_ATTR_PRIORITY = 0x0100,
PSP_FPL_ATTR_HIGHMEM = 0x4000, PSP_FPL_ATTR_HIGHMEM = 0x4000,
PSP_FPL_ATTR_KNOWN = PSP_FPL_ATTR_FIFO | PSP_FPL_ATTR_PRIORITY | PSP_FPL_ATTR_HIGHMEM, PSP_FPL_ATTR_KNOWN = PSP_FPL_ATTR_FIFO | PSP_FPL_ATTR_PRIORITY | PSP_FPL_ATTR_HIGHMEM,
}; };
bool __KernelUnlockFplForThread(FPL *fpl, FplWaitingThread &threadInfo, u32 &error, int result, bool &wokeThreads) bool __KernelUnlockFplForThread(FPL *fpl, FplWaitingThread &threadInfo, u32 &error, int result, bool &wokeThreads)
@ -1321,13 +1321,13 @@ KernelObject *__KernelMemoryPMBObject()
enum SceKernelVplAttr enum SceKernelVplAttr
{ {
PSP_VPL_ATTR_FIFO = 0x0000, PSP_VPL_ATTR_FIFO = 0x0000,
PSP_VPL_ATTR_PRIORITY = 0x0100, PSP_VPL_ATTR_PRIORITY = 0x0100,
PSP_VPL_ATTR_SMALLEST = 0x0200, PSP_VPL_ATTR_SMALLEST = 0x0200,
PSP_VPL_ATTR_MASK_ORDER = 0x0300, PSP_VPL_ATTR_MASK_ORDER = 0x0300,
PSP_VPL_ATTR_HIGHMEM = 0x4000, PSP_VPL_ATTR_HIGHMEM = 0x4000,
PSP_VPL_ATTR_KNOWN = PSP_VPL_ATTR_FIFO | PSP_VPL_ATTR_PRIORITY | PSP_VPL_ATTR_SMALLEST | PSP_VPL_ATTR_HIGHMEM, PSP_VPL_ATTR_KNOWN = PSP_VPL_ATTR_FIFO | PSP_VPL_ATTR_PRIORITY | PSP_VPL_ATTR_SMALLEST | PSP_VPL_ATTR_HIGHMEM,
}; };
bool __KernelUnlockVplForThread(VPL *vpl, VplWaitingThread &threadInfo, u32 &error, int result, bool &wokeThreads) { bool __KernelUnlockVplForThread(VPL *vpl, VplWaitingThread &threadInfo, u32 &error, int result, bool &wokeThreads) {
@ -1818,16 +1818,16 @@ u32 SysMemUserForUser_D8DE5C1E(){
enum enum
{ {
PSP_ERROR_UNKNOWN_TLSPL_ID = 0x800201D0, PSP_ERROR_UNKNOWN_TLSPL_ID = 0x800201D0,
PSP_ERROR_TOO_MANY_TLSPL = 0x800201D1, PSP_ERROR_TOO_MANY_TLSPL = 0x800201D1,
}; };
enum enum
{ {
// TODO: Complete untested guesses. // TODO: Complete untested guesses.
PSP_TLSPL_ATTR_FIFO = 0, PSP_TLSPL_ATTR_FIFO = 0,
PSP_TLSPL_ATTR_PRIORITY = 0x100, PSP_TLSPL_ATTR_PRIORITY = 0x100,
PSP_TLSPL_ATTR_HIGHMEM = 0x4000, PSP_TLSPL_ATTR_HIGHMEM = 0x4000,
PSP_TLSPL_ATTR_KNOWN = PSP_TLSPL_ATTR_HIGHMEM | PSP_TLSPL_ATTR_PRIORITY | PSP_TLSPL_ATTR_FIFO, PSP_TLSPL_ATTR_KNOWN = PSP_TLSPL_ATTR_HIGHMEM | PSP_TLSPL_ATTR_PRIORITY | PSP_TLSPL_ATTR_FIFO,
}; };
struct NativeTlspl struct NativeTlspl

14
Core/HLE/sceKernelSemaphore.cpp
View File

@ -36,19 +36,19 @@
struct NativeSemaphore struct NativeSemaphore
{ {
/** Size of the ::SceKernelSemaInfo structure. */ /** Size of the ::SceKernelSemaInfo structure. */
SceSize_le size; SceSize_le size;
/** NUL-terminated name of the semaphore. */ /** NUL-terminated name of the semaphore. */
char name[KERNELOBJECT_MAX_NAME_LENGTH + 1]; char name[KERNELOBJECT_MAX_NAME_LENGTH + 1];
/** Attributes. */ /** Attributes. */
SceUInt_le attr; SceUInt_le attr;
/** The initial count the semaphore was created with. */ /** The initial count the semaphore was created with. */
s32_le initCount; s32_le initCount;
/** The current count. */ /** The current count. */
s32_le currentCount; s32_le currentCount;
/** The maximum count. */ /** The maximum count. */
s32_le maxCount; s32_le maxCount;
/** The number of threads waiting on the semaphore. */ /** The number of threads waiting on the semaphore. */
s32_le numWaitThreads; s32_le numWaitThreads;
}; };

28
Core/HLE/sceKernelThread.cpp
View File

@ -88,21 +88,21 @@ const char *getWaitTypeName(WaitType type)
return "Unknown"; return "Unknown";
} }
enum { enum {
PSP_THREAD_ATTR_KERNEL = 0x00001000, PSP_THREAD_ATTR_KERNEL = 0x00001000,
PSP_THREAD_ATTR_VFPU = 0x00004000, PSP_THREAD_ATTR_VFPU = 0x00004000,
PSP_THREAD_ATTR_SCRATCH_SRAM = 0x00008000, // Save/restore scratch as part of context??? PSP_THREAD_ATTR_SCRATCH_SRAM = 0x00008000, // Save/restore scratch as part of context???
PSP_THREAD_ATTR_NO_FILLSTACK = 0x00100000, // No filling of 0xff. PSP_THREAD_ATTR_NO_FILLSTACK = 0x00100000, // No filling of 0xff.
PSP_THREAD_ATTR_CLEAR_STACK = 0x00200000, // Clear thread stack when deleted. PSP_THREAD_ATTR_CLEAR_STACK = 0x00200000, // Clear thread stack when deleted.
PSP_THREAD_ATTR_LOW_STACK = 0x00400000, // Allocate stack from bottom not top. PSP_THREAD_ATTR_LOW_STACK = 0x00400000, // Allocate stack from bottom not top.
PSP_THREAD_ATTR_USER = 0x80000000, PSP_THREAD_ATTR_USER = 0x80000000,
PSP_THREAD_ATTR_USBWLAN = 0xa0000000, PSP_THREAD_ATTR_USBWLAN = 0xa0000000,
PSP_THREAD_ATTR_VSH = 0xc0000000, PSP_THREAD_ATTR_VSH = 0xc0000000,
// TODO: Support more, not even sure what all of these mean. // TODO: Support more, not even sure what all of these mean.
PSP_THREAD_ATTR_USER_MASK = 0xf8f060ff, PSP_THREAD_ATTR_USER_MASK = 0xf8f060ff,
PSP_THREAD_ATTR_USER_ERASE = 0x78800000, PSP_THREAD_ATTR_USER_ERASE = 0x78800000,
PSP_THREAD_ATTR_SUPPORTED = (PSP_THREAD_ATTR_KERNEL | PSP_THREAD_ATTR_VFPU | PSP_THREAD_ATTR_NO_FILLSTACK | PSP_THREAD_ATTR_CLEAR_STACK | PSP_THREAD_ATTR_LOW_STACK | PSP_THREAD_ATTR_USER) PSP_THREAD_ATTR_SUPPORTED = (PSP_THREAD_ATTR_KERNEL | PSP_THREAD_ATTR_VFPU | PSP_THREAD_ATTR_NO_FILLSTACK | PSP_THREAD_ATTR_CLEAR_STACK | PSP_THREAD_ATTR_LOW_STACK | PSP_THREAD_ATTR_USER)
}; };
struct NativeCallback struct NativeCallback
@ -190,7 +190,7 @@ struct NativeThread
char name[KERNELOBJECT_MAX_NAME_LENGTH+1]; char name[KERNELOBJECT_MAX_NAME_LENGTH+1];
// Threading stuff // Threading stuff
u32_le attr; u32_le attr;
u32_le status; u32_le status;
u32_le entrypoint; u32_le entrypoint;
u32_le initialStack; u32_le initialStack;

52
Core/HLE/sceKernelThread.h
View File

@ -73,30 +73,30 @@ struct SceKernelSysClock {
// remember to update the waitTypeNames array in sceKernelThread.cpp when changing these // remember to update the waitTypeNames array in sceKernelThread.cpp when changing these
enum WaitType enum WaitType
{ {
WAITTYPE_NONE = 0, WAITTYPE_NONE = 0,
WAITTYPE_SLEEP = 1, WAITTYPE_SLEEP = 1,
WAITTYPE_DELAY = 2, WAITTYPE_DELAY = 2,
WAITTYPE_SEMA = 3, WAITTYPE_SEMA = 3,
WAITTYPE_EVENTFLAG = 4, WAITTYPE_EVENTFLAG = 4,
WAITTYPE_MBX = 5, WAITTYPE_MBX = 5,
WAITTYPE_VPL = 6, WAITTYPE_VPL = 6,
WAITTYPE_FPL = 7, WAITTYPE_FPL = 7,
WAITTYPE_MSGPIPE = 8, // fake WAITTYPE_MSGPIPE = 8, // fake
WAITTYPE_THREADEND = 9, WAITTYPE_THREADEND = 9,
WAITTYPE_AUDIOCHANNEL = 10, // this is fake, should be replaced with 8 eventflags ( ?? ) WAITTYPE_AUDIOCHANNEL = 10, // this is fake, should be replaced with 8 eventflags ( ?? )
WAITTYPE_UMD = 11, // this is fake, should be replaced with 1 eventflag ( ?? ) WAITTYPE_UMD = 11, // this is fake, should be replaced with 1 eventflag ( ?? )
WAITTYPE_VBLANK = 12, // fake WAITTYPE_VBLANK = 12, // fake
WAITTYPE_MUTEX = 13, WAITTYPE_MUTEX = 13,
WAITTYPE_LWMUTEX = 14, WAITTYPE_LWMUTEX = 14,
WAITTYPE_CTRL = 15, WAITTYPE_CTRL = 15,
WAITTYPE_IO = 16, WAITTYPE_IO = 16,
WAITTYPE_GEDRAWSYNC = 17, WAITTYPE_GEDRAWSYNC = 17,
WAITTYPE_GELISTSYNC = 18, WAITTYPE_GELISTSYNC = 18,
WAITTYPE_MODULE = 19, WAITTYPE_MODULE = 19,
WAITTYPE_HLEDELAY = 20, WAITTYPE_HLEDELAY = 20,
WAITTYPE_TLSPL = 21, WAITTYPE_TLSPL = 21,
WAITTYPE_VMEM = 22, WAITTYPE_VMEM = 22,
WAITTYPE_ASYNCIO = 23, WAITTYPE_ASYNCIO = 23,
NUM_WAITTYPES NUM_WAITTYPES
}; };
@ -281,11 +281,11 @@ public:
enum ThreadStatus enum ThreadStatus
{ {
THREADSTATUS_RUNNING = 1, THREADSTATUS_RUNNING = 1,
THREADSTATUS_READY = 2, THREADSTATUS_READY = 2,
THREADSTATUS_WAIT = 4, THREADSTATUS_WAIT = 4,
THREADSTATUS_SUSPEND = 8, THREADSTATUS_SUSPEND = 8,
THREADSTATUS_DORMANT = 16, THREADSTATUS_DORMANT = 16,
THREADSTATUS_DEAD = 32, THREADSTATUS_DEAD = 32,
THREADSTATUS_WAITSUSPEND = THREADSTATUS_WAIT | THREADSTATUS_SUSPEND THREADSTATUS_WAITSUSPEND = THREADSTATUS_WAIT | THREADSTATUS_SUSPEND
}; };

14
Core/HLE/sceNet.cpp
View File

@ -36,16 +36,16 @@ static bool netApctlInited;
const size_t MAX_APCTL_HANDLERS = 32; const size_t MAX_APCTL_HANDLERS = 32;
enum { enum {
ERROR_NET_BUFFER_TOO_SMALL = 0x80400706, ERROR_NET_BUFFER_TOO_SMALL = 0x80400706,
ERROR_NET_INET_ALREADY_INITIALIZED = 0x80410201, ERROR_NET_INET_ALREADY_INITIALIZED = 0x80410201,
ERROR_NET_RESOLVER_BAD_ID = 0x80410408, ERROR_NET_RESOLVER_BAD_ID = 0x80410408,
ERROR_NET_RESOLVER_ALREADY_STOPPED = 0x8041040a, ERROR_NET_RESOLVER_ALREADY_STOPPED = 0x8041040a,
ERROR_NET_RESOLVER_INVALID_HOST = 0x80410414, ERROR_NET_RESOLVER_INVALID_HOST = 0x80410414,
ERROR_NET_APCTL_ALREADY_INITIALIZED = 0x80410a01, ERROR_NET_APCTL_ALREADY_INITIALIZED = 0x80410a01,
ERROR_NET_ADHOCCTL_TOO_MANY_HANDLERS = 0x80410b12, ERROR_NET_ADHOCCTL_TOO_MANY_HANDLERS = 0x80410b12,
}; };
enum { enum {

6
Core/HLE/sceNetAdhoc.cpp
View File

@ -79,10 +79,10 @@ enum {
}; };
enum { enum {
PSP_ADHOC_POLL_READY_TO_SEND = 1, PSP_ADHOC_POLL_READY_TO_SEND = 1,
PSP_ADHOC_POLL_DATA_AVAILABLE = 2, PSP_ADHOC_POLL_DATA_AVAILABLE = 2,
PSP_ADHOC_POLL_CAN_CONNECT = 4, PSP_ADHOC_POLL_CAN_CONNECT = 4,
PSP_ADHOC_POLL_CAN_ACCEPT = 8, PSP_ADHOC_POLL_CAN_ACCEPT = 8,
}; };
const size_t MAX_ADHOCCTL_HANDLERS = 32; const size_t MAX_ADHOCCTL_HANDLERS = 32;

36
Core/HLE/scePsmf.cpp
View File

@ -58,33 +58,33 @@ int videoPixelMode = GE_CMODE_32BIT_ABGR8888;
int videoLoopStatus = PSMF_PLAYER_CONFIG_NO_LOOP; int videoLoopStatus = PSMF_PLAYER_CONFIG_NO_LOOP;
enum PsmfPlayerError { enum PsmfPlayerError {
ERROR_PSMF_NOT_INITIALIZED = 0x80615001, ERROR_PSMF_NOT_INITIALIZED = 0x80615001,
ERROR_PSMF_BAD_VERSION = 0x80615002, ERROR_PSMF_BAD_VERSION = 0x80615002,
ERROR_PSMF_NOT_FOUND = 0x80615025, ERROR_PSMF_NOT_FOUND = 0x80615025,
ERROR_PSMF_INVALID_ID = 0x80615100, ERROR_PSMF_INVALID_ID = 0x80615100,
ERROR_PSMF_INVALID_VALUE = 0x806151fe, ERROR_PSMF_INVALID_VALUE = 0x806151fe,
ERROR_PSMF_INVALID_TIMESTAMP = 0x80615500, ERROR_PSMF_INVALID_TIMESTAMP = 0x80615500,
ERROR_PSMF_INVALID_PSMF = 0x80615501, ERROR_PSMF_INVALID_PSMF = 0x80615501,
ERROR_PSMFPLAYER_NOT_INITIALIZED = 0x80616001, ERROR_PSMFPLAYER_NOT_INITIALIZED = 0x80616001,
ERROR_PSMFPLAYER_NO_MORE_DATA = 0x8061600c, ERROR_PSMFPLAYER_NO_MORE_DATA = 0x8061600c,
}; };
enum PsmfPlayerStatus { enum PsmfPlayerStatus {
PSMF_PLAYER_STATUS_NONE = 0x0, PSMF_PLAYER_STATUS_NONE = 0x0,
PSMF_PLAYER_STATUS_INIT = 0x1, PSMF_PLAYER_STATUS_INIT = 0x1,
PSMF_PLAYER_STATUS_STANDBY = 0x2, PSMF_PLAYER_STATUS_STANDBY = 0x2,
PSMF_PLAYER_STATUS_PLAYING = 0x4, PSMF_PLAYER_STATUS_PLAYING = 0x4,
PSMF_PLAYER_STATUS_ERROR = 0x100, PSMF_PLAYER_STATUS_ERROR = 0x100,
PSMF_PLAYER_STATUS_PLAYING_FINISHED = 0x200, PSMF_PLAYER_STATUS_PLAYING_FINISHED = 0x200,
}; };
enum PsmfPlayerMode { enum PsmfPlayerMode {
PSMF_PLAYER_MODE_PLAY = 0, PSMF_PLAYER_MODE_PLAY = 0,
PSMF_PLAYER_MODE_SLOWMOTION = 1, PSMF_PLAYER_MODE_SLOWMOTION = 1,
PSMF_PLAYER_MODE_STEPFRAME = 2, PSMF_PLAYER_MODE_STEPFRAME = 2,
PSMF_PLAYER_MODE_PAUSE = 3, PSMF_PLAYER_MODE_PAUSE = 3,
PSMF_PLAYER_MODE_FORWARD = 4, PSMF_PLAYER_MODE_FORWARD = 4,
PSMF_PLAYER_MODE_REWIND = 5, PSMF_PLAYER_MODE_REWIND = 5,
}; };
struct PsmfData { struct PsmfData {

34
Core/HLE/sceSas.cpp
View File

@ -38,24 +38,24 @@
#include "Core/HLE/sceKernel.h" #include "Core/HLE/sceKernel.h"
enum { enum {
ERROR_SAS_INVALID_GRAIN = 0x80420001, ERROR_SAS_INVALID_GRAIN = 0x80420001,
ERROR_SAS_INVALID_MAX_VOICES = 0x80420002, ERROR_SAS_INVALID_MAX_VOICES = 0x80420002,
ERROR_SAS_INVALID_OUTPUT_MODE = 0x80420003, ERROR_SAS_INVALID_OUTPUT_MODE = 0x80420003,
ERROR_SAS_INVALID_SAMPLE_RATE = 0x80420004, ERROR_SAS_INVALID_SAMPLE_RATE = 0x80420004,
ERROR_SAS_BAD_ADDRESS = 0x80420005, ERROR_SAS_BAD_ADDRESS = 0x80420005,
ERROR_SAS_INVALID_VOICE = 0x80420010, ERROR_SAS_INVALID_VOICE = 0x80420010,
ERROR_SAS_INVALID_NOISE_FREQ = 0x80420011, ERROR_SAS_INVALID_NOISE_FREQ = 0x80420011,
ERROR_SAS_INVALID_PITCH = 0x80420012, ERROR_SAS_INVALID_PITCH = 0x80420012,
ERROR_SAS_INVALID_ADSR_CURVE_MODE = 0x80420013, ERROR_SAS_INVALID_ADSR_CURVE_MODE = 0x80420013,
ERROR_SAS_INVALID_PARAMETER = 0x80420014, ERROR_SAS_INVALID_PARAMETER = 0x80420014,
ERROR_SAS_INVALID_LOOP_POS = 0x80420015, ERROR_SAS_INVALID_LOOP_POS = 0x80420015,
ERROR_SAS_VOICE_PAUSED = 0x80420016, ERROR_SAS_VOICE_PAUSED = 0x80420016,
ERROR_SAS_INVALID_VOLUME = 0x80420018, ERROR_SAS_INVALID_VOLUME = 0x80420018,
ERROR_SAS_INVALID_ADSR_RATE = 0x80420019, ERROR_SAS_INVALID_ADSR_RATE = 0x80420019,
ERROR_SAS_INVALID_PCM_SIZE = 0x8042001A, ERROR_SAS_INVALID_PCM_SIZE = 0x8042001A,
ERROR_SAS_REV_INVALID_VOLUME = 0x80420023, ERROR_SAS_REV_INVALID_VOLUME = 0x80420023,
ERROR_SAS_BUSY = 0x80420030, ERROR_SAS_BUSY = 0x80420030,
ERROR_SAS_NOT_INIT = 0x80420100, ERROR_SAS_NOT_INIT = 0x80420100,
}; };
// TODO - allow more than one, associating each with one Core pointer (passed in to all the functions) // TODO - allow more than one, associating each with one Core pointer (passed in to all the functions)

6
Core/HLE/sceSsl.cpp
View File

@ -20,9 +20,9 @@
#include "sceSsl.h" #include "sceSsl.h"
#define ERROR_SSL_NOT_INIT 0x80435001; #define ERROR_SSL_NOT_INIT 0x80435001;
#define ERROR_SSL_ALREADY_INIT 0x80435020; #define ERROR_SSL_ALREADY_INIT 0x80435020;
#define ERROR_SSL_OUT_OF_MEMORY 0x80435022; #define ERROR_SSL_OUT_OF_MEMORY 0x80435022;
#define ERROR_SSL_INVALID_PARAMETER 0x804351FE; #define ERROR_SSL_INVALID_PARAMETER 0x804351FE;
bool isSslInit; bool isSslInit;

18
Core/HLE/sceUmd.h
View File

@ -18,22 +18,22 @@
#pragma once #pragma once
enum pspUmdState { enum pspUmdState {
PSP_UMD_INIT = 0x00, PSP_UMD_INIT = 0x00,
PSP_UMD_NOT_PRESENT = 0x01, PSP_UMD_NOT_PRESENT = 0x01,
PSP_UMD_PRESENT = 0x02, PSP_UMD_PRESENT = 0x02,
PSP_UMD_CHANGED = 0x04, PSP_UMD_CHANGED = 0x04,
PSP_UMD_NOT_READY = 0x08, PSP_UMD_NOT_READY = 0x08,
PSP_UMD_READY = 0x10, PSP_UMD_READY = 0x10,
PSP_UMD_READABLE = 0x20, PSP_UMD_READABLE = 0x20,
}; };
enum pspUmdError { enum pspUmdError {
PSP_ERROR_UMD_NOT_READY = 0x80210001, PSP_ERROR_UMD_NOT_READY = 0x80210001,
PSP_ERROR_UMD_INVALID_PARAM = 0x80010016, PSP_ERROR_UMD_INVALID_PARAM = 0x80010016,
}; };
enum pspUmdType { enum pspUmdType {
PSP_UMD_TYPE_GAME = 0x10, PSP_UMD_TYPE_GAME = 0x10,
PSP_UMD_TYPE_VIDEO = 0x20, PSP_UMD_TYPE_VIDEO = 0x20,
PSP_UMD_TYPE_AUDIO = 0x40, PSP_UMD_TYPE_AUDIO = 0x40,
}; };

16
Core/HLE/sceUtility.cpp
View File

@ -168,14 +168,14 @@ int sceUtilitySavedataUpdate(int animSpeed)
return result; return result;
} }
#define PSP_AV_MODULE_AVCODEC 0 #define PSP_AV_MODULE_AVCODEC 0
#define PSP_AV_MODULE_SASCORE 1 #define PSP_AV_MODULE_SASCORE 1
#define PSP_AV_MODULE_ATRAC3PLUS 2 // Requires PSP_AV_MODULE_AVCODEC loading first #define PSP_AV_MODULE_ATRAC3PLUS 2 // Requires PSP_AV_MODULE_AVCODEC loading first
#define PSP_AV_MODULE_MPEGBASE 3 // Requires PSP_AV_MODULE_AVCODEC loading first #define PSP_AV_MODULE_MPEGBASE 3 // Requires PSP_AV_MODULE_AVCODEC loading first
#define PSP_AV_MODULE_MP3 4 #define PSP_AV_MODULE_MP3 4
#define PSP_AV_MODULE_VAUDIO 5 #define PSP_AV_MODULE_VAUDIO 5
#define PSP_AV_MODULE_AAC 6 #define PSP_AV_MODULE_AAC 6
#define PSP_AV_MODULE_G729 7 #define PSP_AV_MODULE_G729 7
u32 sceUtilityLoadAvModule(u32 module) u32 sceUtilityLoadAvModule(u32 module)
{ {

74
Core/HLE/sceUtility.h
View File

@ -23,33 +23,33 @@
class PointerWrap; class PointerWrap;
// Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE // Valid values for PSP_SYSTEMPARAM_ID_INT_LANGUAGE
#define PSP_SYSTEMPARAM_LANGUAGE_JAPANESE 0 #define PSP_SYSTEMPARAM_LANGUAGE_JAPANESE 0
#define PSP_SYSTEMPARAM_LANGUAGE_ENGLISH 1 #define PSP_SYSTEMPARAM_LANGUAGE_ENGLISH 1
#define PSP_SYSTEMPARAM_LANGUAGE_FRENCH 2 #define PSP_SYSTEMPARAM_LANGUAGE_FRENCH 2
#define PSP_SYSTEMPARAM_LANGUAGE_SPANISH 3 #define PSP_SYSTEMPARAM_LANGUAGE_SPANISH 3
#define PSP_SYSTEMPARAM_LANGUAGE_GERMAN 4 #define PSP_SYSTEMPARAM_LANGUAGE_GERMAN 4
#define PSP_SYSTEMPARAM_LANGUAGE_ITALIAN 5 #define PSP_SYSTEMPARAM_LANGUAGE_ITALIAN 5
#define PSP_SYSTEMPARAM_LANGUAGE_DUTCH 6 #define PSP_SYSTEMPARAM_LANGUAGE_DUTCH 6
#define PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE 7 #define PSP_SYSTEMPARAM_LANGUAGE_PORTUGUESE 7
#define PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN 8 #define PSP_SYSTEMPARAM_LANGUAGE_RUSSIAN 8
#define PSP_SYSTEMPARAM_LANGUAGE_KOREAN 9 #define PSP_SYSTEMPARAM_LANGUAGE_KOREAN 9
#define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL 10 #define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_TRADITIONAL 10
#define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED 11 #define PSP_SYSTEMPARAM_LANGUAGE_CHINESE_SIMPLIFIED 11
#define PSP_SYSTEMPARAM_TIME_FORMAT_24HR 0 #define PSP_SYSTEMPARAM_TIME_FORMAT_24HR 0
#define PSP_SYSTEMPARAM_TIME_FORMAT_12HR 1 #define PSP_SYSTEMPARAM_TIME_FORMAT_12HR 1
#define PSP_SYSTEMPARAM_ID_STRING_NICKNAME 1 #define PSP_SYSTEMPARAM_ID_STRING_NICKNAME 1
#define PSP_SYSTEMPARAM_ID_INT_ADHOC_CHANNEL 2 #define PSP_SYSTEMPARAM_ID_INT_ADHOC_CHANNEL 2
#define PSP_SYSTEMPARAM_ID_INT_WLAN_POWERSAVE 3 #define PSP_SYSTEMPARAM_ID_INT_WLAN_POWERSAVE 3
#define PSP_SYSTEMPARAM_ID_INT_DATE_FORMAT 4 #define PSP_SYSTEMPARAM_ID_INT_DATE_FORMAT 4
#define PSP_SYSTEMPARAM_ID_INT_TIME_FORMAT 5 #define PSP_SYSTEMPARAM_ID_INT_TIME_FORMAT 5
//Timezone offset from UTC in minutes, (EST = -300 = -5 * 60) //Timezone offset from UTC in minutes, (EST = -300 = -5 * 60)
#define PSP_SYSTEMPARAM_ID_INT_TIMEZONE 6 #define PSP_SYSTEMPARAM_ID_INT_TIMEZONE 6
#define PSP_SYSTEMPARAM_ID_INT_DAYLIGHTSAVINGS 7 #define PSP_SYSTEMPARAM_ID_INT_DAYLIGHTSAVINGS 7
#define PSP_SYSTEMPARAM_ID_INT_LANGUAGE 8 #define PSP_SYSTEMPARAM_ID_INT_LANGUAGE 8
#define PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE 9 #define PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE 9
#define PSP_SYSTEMPARAM_ID_INT_LOCK_PARENTAL_LEVEL 10 #define PSP_SYSTEMPARAM_ID_INT_LOCK_PARENTAL_LEVEL 10
// Return values for the SystemParam functions // Return values for the SystemParam functions
#define PSP_SYSTEMPARAM_RETVAL_OK 0 #define PSP_SYSTEMPARAM_RETVAL_OK 0
@ -57,27 +57,27 @@ class PointerWrap;
#define PSP_SYSTEMPARAM_RETVAL_FAIL 0x80110103 #define PSP_SYSTEMPARAM_RETVAL_FAIL 0x80110103
// Valid values for PSP_SYSTEMPARAM_ID_INT_ADHOC_CHANNEL // Valid values for PSP_SYSTEMPARAM_ID_INT_ADHOC_CHANNEL
#define PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC 0 #define PSP_SYSTEMPARAM_ADHOC_CHANNEL_AUTOMATIC 0
#define PSP_SYSTEMPARAM_ADHOC_CHANNEL_1 1 #define PSP_SYSTEMPARAM_ADHOC_CHANNEL_1 1
#define PSP_SYSTEMPARAM_ADHOC_CHANNEL_6 6 #define PSP_SYSTEMPARAM_ADHOC_CHANNEL_6 6
#define PSP_SYSTEMPARAM_ADHOC_CHANNEL_11 11 #define PSP_SYSTEMPARAM_ADHOC_CHANNEL_11 11
// Valid values for PSP_SYSTEMPARAM_ID_INT_WLAN_POWERSAVE // Valid values for PSP_SYSTEMPARAM_ID_INT_WLAN_POWERSAVE
#define PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF 0 #define PSP_SYSTEMPARAM_WLAN_POWERSAVE_OFF 0
#define PSP_SYSTEMPARAM_WLAN_POWERSAVE_ON 1 #define PSP_SYSTEMPARAM_WLAN_POWERSAVE_ON 1
// Valid values for PSP_SYSTEMPARAM_ID_INT_DATE_FORMAT // Valid values for PSP_SYSTEMPARAM_ID_INT_DATE_FORMAT
#define PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD 0 #define PSP_SYSTEMPARAM_DATE_FORMAT_YYYYMMDD 0
#define PSP_SYSTEMPARAM_DATE_FORMAT_MMDDYYYY 1 #define PSP_SYSTEMPARAM_DATE_FORMAT_MMDDYYYY 1
#define PSP_SYSTEMPARAM_DATE_FORMAT_DDMMYYYY 2 #define PSP_SYSTEMPARAM_DATE_FORMAT_DDMMYYYY 2
// Valid values for PSP_SYSTEMPARAM_ID_INT_DAYLIGHTSAVINGS // Valid values for PSP_SYSTEMPARAM_ID_INT_DAYLIGHTSAVINGS
#define PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_STD 0 #define PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_STD 0
#define PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_SAVING 1 #define PSP_SYSTEMPARAM_DAYLIGHTSAVINGS_SAVING 1
// Valid values for PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE // Valid values for PSP_SYSTEMPARAM_ID_INT_BUTTON_PREFERENCE
#define PSP_SYSTEMPARAM_BUTTON_CIRCLE 0 #define PSP_SYSTEMPARAM_BUTTON_CIRCLE 0
#define PSP_SYSTEMPARAM_BUTTON_CROSS 1 #define PSP_SYSTEMPARAM_BUTTON_CROSS 1
void __UtilityInit(); void __UtilityInit();
void __UtilityDoState(PointerWrap &p); void __UtilityDoState(PointerWrap &p);

8
Core/HW/MemoryStick.h
View File

@ -6,16 +6,16 @@ class PointerWrap;
// mscmhc0 states // mscmhc0 states
enum MemStickState { enum MemStickState {
PSP_MEMORYSTICK_STATE_DRIVER_READY = 1, PSP_MEMORYSTICK_STATE_DRIVER_READY = 1,
PSP_MEMORYSTICK_STATE_DRIVER_BUSY = 2, PSP_MEMORYSTICK_STATE_DRIVER_BUSY = 2,
PSP_MEMORYSTICK_STATE_DEVICE_INSERTED = 4, PSP_MEMORYSTICK_STATE_DEVICE_INSERTED = 4,
PSP_MEMORYSTICK_STATE_DEVICE_REMOVED = 8, PSP_MEMORYSTICK_STATE_DEVICE_REMOVED = 8,
}; };
// memstick FAT states. // memstick FAT states.
enum MemStickFatState { enum MemStickFatState {
PSP_FAT_MEMORYSTICK_STATE_UNASSIGNED = 0, PSP_FAT_MEMORYSTICK_STATE_UNASSIGNED = 0,
PSP_FAT_MEMORYSTICK_STATE_ASSIGNED = 1, PSP_FAT_MEMORYSTICK_STATE_ASSIGNED = 1,
}; };
void MemoryStick_DoState(PointerWrap &p); void MemoryStick_DoState(PointerWrap &p);

44
Core/MIPS/MIPSAsmTables.h
View File

@ -16,29 +16,29 @@ typedef struct {
short len; short len;
} tMipsRegister; } tMipsRegister;
#define O_RS 0x00000001 // source reg #define O_RS 0x00000001 // source reg
#define O_RT 0x00000002 // target reg #define O_RT 0x00000002 // target reg
#define O_RD 0x00000004 // dest reg #define O_RD 0x00000004 // dest reg
#define O_I16 0x00000008 // 16 bit immediate #define O_I16 0x00000008 // 16 bit immediate
#define O_I20 0x00000010 // 16 bit immediate #define O_I20 0x00000010 // 16 bit immediate
#define O_IPCA 0x00000020 // pc >> 2 #define O_IPCA 0x00000020 // pc >> 2
#define O_IPCR 0x00000080 // PC, -> difference >> 2 #define O_IPCR 0x00000080 // PC, -> difference >> 2
#define O_I26 0x00000200 // 26 bit immediate #define O_I26 0x00000200 // 26 bit immediate
#define O_I5 0x00000400 // 5 bit immediate #define O_I5 0x00000400 // 5 bit immediate
#define O_RSD 0x00000800 // rs = rd #define O_RSD 0x00000800 // rs = rd
#define O_RST 0x00001000 // rs = rt #define O_RST 0x00001000 // rs = rt
#define O_RDT 0x00002000 // rd = rt #define O_RDT 0x00002000 // rd = rt
#define MO_DELAY 0x00004000 // delay slot follows #define MO_DELAY 0x00004000 // delay slot follows
#define MO_NODELAY 0x00008000 // can't be in a delay slot #define MO_NODELAY 0x00008000 // can't be in a delay slot
#define MO_DELAYRT 0x00010000 // rt won't be available for one instruction #define MO_DELAYRT 0x00010000 // rt won't be available for one instruction
#define MO_IGNORERTD 0x00020000 // don't care for rt delay #define MO_IGNORERTD 0x00020000 // don't care for rt delay
#define MO_FRS 0x00040000 // float rs #define MO_FRS 0x00040000 // float rs
#define MO_FRD 0x00080000 // float rd #define MO_FRD 0x00080000 // float rd
#define MO_FRT 0x00100000 // float rt #define MO_FRT 0x00100000 // float rt
#define MO_FRSD 0x00200000 // float rs + rd #define MO_FRSD 0x00200000 // float rs + rd
#define MO_FRST 0x00400000 // float rs + rt #define MO_FRST 0x00400000 // float rs + rt
#define MO_FRDT 0x00800000 // float rt + rd #define MO_FRDT 0x00800000 // float rt + rd
extern const tMipsRegister MipsRegister[]; extern const tMipsRegister MipsRegister[];
extern const tMipsRegister MipsFloatRegister[]; extern const tMipsRegister MipsFloatRegister[];

28
Core/MIPS/MIPSDebugInterface.cpp
View File

@ -28,12 +28,12 @@
#include "Core/System.h" #include "Core/System.h"
enum ReferenceIndexType { enum ReferenceIndexType {
REF_INDEX_PC = 32, REF_INDEX_PC = 32,
REF_INDEX_HI = 33, REF_INDEX_HI = 33,
REF_INDEX_LO = 34, REF_INDEX_LO = 34,
REF_INDEX_FPU = 0x1000, REF_INDEX_FPU = 0x1000,
REF_INDEX_FPU_INT = 0x2000, REF_INDEX_FPU_INT = 0x2000,
REF_INDEX_VFPU = 0x4000, REF_INDEX_VFPU = 0x4000,
REF_INDEX_VFPU_INT = 0x8000, REF_INDEX_VFPU_INT = 0x8000,
REF_INDEX_IS_FLOAT = REF_INDEX_FPU | REF_INDEX_VFPU, REF_INDEX_IS_FLOAT = REF_INDEX_FPU | REF_INDEX_VFPU,
}; };
@ -254,14 +254,14 @@ const char *MIPSDebugInterface::GetName()
const char *MIPSDebugInterface::GetRegName(int cat, int index) const char *MIPSDebugInterface::GetRegName(int cat, int index)
{ {
static const char *regName[32] = { static const char *regName[32] = {
"zero", "at", "v0", "v1", "zero", "at", "v0", "v1",
"a0", "a1", "a2", "a3", "a0", "a1", "a2", "a3",
"t0", "t1", "t2", "t3", "t0", "t1", "t2", "t3",
"t4", "t5", "t6", "t7", "t4", "t5", "t6", "t7",
"s0", "s1", "s2", "s3", "s0", "s1", "s2", "s3",
"s4", "s5", "s6", "s7", "s4", "s5", "s6", "s7",
"t8", "t9", "k0", "k1", "t8", "t9", "k0", "k1",
"gp", "sp", "fp", "ra" "gp", "sp", "fp", "ra"
}; };
// really nasty hack so that this function can be called several times on one line of c++. // really nasty hack so that this function can be called several times on one line of c++.

16
Core/MIPS/MIPSDis.cpp
View File

@ -23,14 +23,14 @@
#include "JitCommon/JitCommon.h" #include "JitCommon/JitCommon.h"
#define _RS ((op>>21) & 0x1F) #define _RS ((op>>21) & 0x1F)
#define _RT ((op>>16) & 0x1F) #define _RT ((op>>16) & 0x1F)
#define _RD ((op>>11) & 0x1F) #define _RD ((op>>11) & 0x1F)
#define _FS ((op>>11) & 0x1F) #define _FS ((op>>11) & 0x1F)
#define _FT ((op>>16) & 0x1F) #define _FT ((op>>16) & 0x1F)
#define _FD ((op>>6 ) & 0x1F) #define _FD ((op>>6 ) & 0x1F)
#define _POS ((op>>6 ) & 0x1F) #define _POS ((op>>6 ) & 0x1F)
#define _SIZE ((op>>11 ) & 0x1F) #define _SIZE ((op>>11) & 0x1F)
#define RN(i) currentDebugMIPS->GetRegName(0,i) #define RN(i) currentDebugMIPS->GetRegName(0,i)
#define FN(i) currentDebugMIPS->GetRegName(1,i) #define FN(i) currentDebugMIPS->GetRegName(1,i)

16
Core/MIPS/MIPSDisVFPU.cpp
View File

@ -24,14 +24,14 @@
#include "MIPSVFPUUtils.h" #include "MIPSVFPUUtils.h"
#define _RS ((op>>21) & 0x1F) #define _RS ((op>>21) & 0x1F)
#define _RT ((op>>16) & 0x1F) #define _RT ((op>>16) & 0x1F)
#define _RD ((op>>11) & 0x1F) #define _RD ((op>>11) & 0x1F)
#define _FS ((op>>11) & 0x1F) #define _FS ((op>>11) & 0x1F)
#define _FT ((op>>16) & 0x1F) #define _FT ((op>>16) & 0x1F)
#define _FD ((op>>6 ) & 0x1F) #define _FD ((op>>6 ) & 0x1F)
#define _POS ((op>>6 ) & 0x1F) #define _POS ((op>>6 ) & 0x1F)
#define _SIZE ((op>>11 ) & 0x1F) #define _SIZE ((op>>11) & 0x1F)
#define RN(i) currentDebugMIPS->GetRegName(0,i) #define RN(i) currentDebugMIPS->GetRegName(0,i)

16
Core/MIPS/MIPSInt.cpp
View File

@ -41,14 +41,14 @@
#define FsI(i) (currentMIPS->fs[i]) #define FsI(i) (currentMIPS->fs[i])
#define PC (currentMIPS->pc) #define PC (currentMIPS->pc)
#define _RS ((op>>21) & 0x1F) #define _RS ((op>>21) & 0x1F)
#define _RT ((op>>16) & 0x1F) #define _RT ((op>>16) & 0x1F)
#define _RD ((op>>11) & 0x1F) #define _RD ((op>>11) & 0x1F)
#define _FS ((op>>11) & 0x1F) #define _FS ((op>>11) & 0x1F)
#define _FT ((op>>16) & 0x1F) #define _FT ((op>>16) & 0x1F)
#define _FD ((op>>6 ) & 0x1F) #define _FD ((op>>6 ) & 0x1F)
#define _POS ((op>>6 ) & 0x1F) #define _POS ((op>>6 ) & 0x1F)
#define _SIZE ((op>>11 ) & 0x1F) #define _SIZE ((op>>11) & 0x1F)
#define HI currentMIPS->hi #define HI currentMIPS->hi
#define LO currentMIPS->lo #define LO currentMIPS->lo

8
Core/MIPS/MIPSIntVFPU.cpp
View File

@ -38,14 +38,14 @@
#define FsI(i) (currentMIPS->fs[i]) #define FsI(i) (currentMIPS->fs[i])
#define PC (currentMIPS->pc) #define PC (currentMIPS->pc)
#define _RS ((op >> 21) & 0x1F) #define _RS ((op>>21) & 0x1F)
#define _RT ((op >> 16) & 0x1F) #define _RT ((op>>16) & 0x1F)
#define _RD ((op>>11) & 0x1F) #define _RD ((op>>11) & 0x1F)
#define _FS ((op>>11) & 0x1F) #define _FS ((op>>11) & 0x1F)
#define _FT ((op >> 16) & 0x1F) #define _FT ((op>>16) & 0x1F)
#define _FD ((op>>6 ) & 0x1F) #define _FD ((op>>6 ) & 0x1F)
#define _POS ((op>>6 ) & 0x1F) #define _POS ((op>>6 ) & 0x1F)
#define _SIZE ((op>>11 ) & 0x1F) #define _SIZE ((op>>11) & 0x1F)
#define HI currentMIPS->hi #define HI currentMIPS->hi
#define LO currentMIPS->lo #define LO currentMIPS->lo

22
Core/MIPS/MIPSTables.h
View File

@ -35,24 +35,24 @@ struct MIPSInfo {
u32 value; u32 value;
}; };
#define CONDTYPE_MASK 0x00000007 #define CONDTYPE_MASK 0x00000007
#define CONDTYPE_EQ 0x00000001 #define CONDTYPE_EQ 0x00000001
#define CONDTYPE_NE 0x00000002 #define CONDTYPE_NE 0x00000002
#define CONDTYPE_LEZ 0x00000003 #define CONDTYPE_LEZ 0x00000003
#define CONDTYPE_GTZ 0x00000004 #define CONDTYPE_GTZ 0x00000004
#define CONDTYPE_LTZ 0x00000005 #define CONDTYPE_LTZ 0x00000005
#define CONDTYPE_GEZ 0x00000006 #define CONDTYPE_GEZ 0x00000006
#define CONDTYPE_FPUFALSE CONDTYPE_EQ #define CONDTYPE_FPUFALSE CONDTYPE_EQ
#define CONDTYPE_FPUTRUE CONDTYPE_NE #define CONDTYPE_FPUTRUE CONDTYPE_NE
// as long as the other flags are checked, // as long as the other flags are checked,
// there is no way to misinterpret these // there is no way to misinterpret these
// as CONDTYPE_X // as CONDTYPE_X
#define MEMTYPE_MASK 0x00000007 #define MEMTYPE_MASK 0x00000007
#define MEMTYPE_BYTE 0x00000001 #define MEMTYPE_BYTE 0x00000001
#define MEMTYPE_HWORD 0x00000002 #define MEMTYPE_HWORD 0x00000002
#define MEMTYPE_WORD 0x00000003 #define MEMTYPE_WORD 0x00000003
#define MEMTYPE_FLOAT 0x00000004 #define MEMTYPE_FLOAT 0x00000004
#define MEMTYPE_VQUAD 0x00000005 #define MEMTYPE_VQUAD 0x00000005

14
Core/MIPS/MIPSVFPUUtils.h
View File

@ -28,13 +28,13 @@ inline int Xpose(int v)
return v^0x20; return v^0x20;
} }
#define VFPU_FLOAT16_EXP_MAX 0x1f #define VFPU_FLOAT16_EXP_MAX 0x1f
#define VFPU_SH_FLOAT16_SIGN 15 #define VFPU_SH_FLOAT16_SIGN 15
#define VFPU_MASK_FLOAT16_SIGN 0x1 #define VFPU_MASK_FLOAT16_SIGN 0x1
#define VFPU_SH_FLOAT16_EXP 10 #define VFPU_SH_FLOAT16_EXP 10
#define VFPU_MASK_FLOAT16_EXP 0x1f #define VFPU_MASK_FLOAT16_EXP 0x1f
#define VFPU_SH_FLOAT16_FRAC 0 #define VFPU_SH_FLOAT16_FRAC 0
#define VFPU_MASK_FLOAT16_FRAC 0x3ff #define VFPU_MASK_FLOAT16_FRAC 0x3ff
enum VectorSize enum VectorSize
{ {

16
Core/MIPS/PPC/PpcCompLoadStore.cpp
View File

@ -12,14 +12,14 @@
#include "PpcJit.h" #include "PpcJit.h"
#define _RS ((op>>21) & 0x1F) #define _RS ((op>>21) & 0x1F)
#define _RT ((op>>16) & 0x1F) #define _RT ((op>>16) & 0x1F)
#define _RD ((op>>11) & 0x1F) #define _RD ((op>>11) & 0x1F)
#define _FS ((op>>11) & 0x1F) #define _FS ((op>>11) & 0x1F)
#define _FT ((op>>16) & 0x1F) #define _FT ((op>>16) & 0x1F)
#define _FD ((op>>6 ) & 0x1F) #define _FD ((op>>6 ) & 0x1F)
#define _POS ((op>>6 ) & 0x1F) #define _POS ((op>>6 ) & 0x1F)
#define _SIZE ((op>>11 ) & 0x1F) #define _SIZE ((op>>11) & 0x1F)
// All functions should have CONDITIONAL_DISABLE, so we can narrow things down to a file quickly. // All functions should have CONDITIONAL_DISABLE, so we can narrow things down to a file quickly.
// Currently known non working ones should have DISABLE. // Currently known non working ones should have DISABLE.

6
Core/MIPS/PPC/PpcJit.h
View File

@ -46,9 +46,9 @@ namespace MIPSComp
{ {
enum PrefixState enum PrefixState
{ {
PREFIX_UNKNOWN = 0x00, PREFIX_UNKNOWN = 0x00,
PREFIX_KNOWN = 0x01, PREFIX_KNOWN = 0x01,
PREFIX_DIRTY = 0x10, PREFIX_DIRTY = 0x10,
PREFIX_KNOWN_DIRTY = 0x11, PREFIX_KNOWN_DIRTY = 0x11,
}; };

2
Core/MIPS/PPC/PpcRegCache.h
View File

@ -54,7 +54,7 @@ using namespace PpcGen;
// Safe to use this as scratch regs ? // Safe to use this as scratch regs ?
#define SREG (R5) #define SREG (R5)
#define FLAGREG (R18) #define FLAGREG (R18)
// Special MIPS registers: // Special MIPS registers:

12
Core/MemMap.h
View File

@ -41,7 +41,7 @@ typedef void (*writeFn16)(const u16,const u32);
typedef void (*writeFn32)(const u32,const u32); typedef void (*writeFn32)(const u32,const u32);
typedef void (*writeFn64)(const u64,const u32); typedef void (*writeFn64)(const u64,const u32);
typedef void (*readFn8 )(u8&, const u32); typedef void (*readFn8 )(u8&, const u32);
typedef void (*readFn16)(u16&, const u32); typedef void (*readFn16)(u16&, const u32);
typedef void (*readFn32)(u32&, const u32); typedef void (*readFn32)(u32&, const u32);
typedef void (*readFn64)(u64&, const u32); typedef void (*readFn64)(u64&, const u32);
@ -89,15 +89,15 @@ enum
// Used if the PSP model is PSP-2000 (Slim). // Used if the PSP model is PSP-2000 (Slim).
RAM_DOUBLE_SIZE = RAM_NORMAL_SIZE * 2, RAM_DOUBLE_SIZE = RAM_NORMAL_SIZE * 2,
VRAM_SIZE = 0x200000, VRAM_SIZE = 0x200000,
VRAM_MASK = VRAM_SIZE - 1, VRAM_MASK = VRAM_SIZE - 1,
SCRATCHPAD_SIZE = 0x4000, SCRATCHPAD_SIZE = 0x4000,
SCRATCHPAD_MASK = SCRATCHPAD_SIZE - 1, SCRATCHPAD_MASK = SCRATCHPAD_SIZE - 1,
#if defined(_M_IX86) || defined(_M_ARM32) || defined(_XBOX) #if defined(_M_IX86) || defined(_M_ARM32) || defined(_XBOX)
// This wraparound should work for PSP too. // This wraparound should work for PSP too.
MEMVIEW32_MASK = 0x3FFFFFFF, MEMVIEW32_MASK = 0x3FFFFFFF,
#endif #endif
}; };
@ -430,8 +430,8 @@ inline u32 PSP_GetScratchpadMemoryBase() { return 0x00010000;}
inline u32 PSP_GetScratchpadMemoryEnd() { return 0x00014000;} inline u32 PSP_GetScratchpadMemoryEnd() { return 0x00014000;}
inline u32 PSP_GetKernelMemoryBase() { return 0x08000000;} inline u32 PSP_GetKernelMemoryBase() { return 0x08000000;}
inline u32 PSP_GetUserMemoryEnd() { return PSP_GetKernelMemoryBase() + Memory::g_MemorySize;} inline u32 PSP_GetUserMemoryEnd() { return PSP_GetKernelMemoryBase() + Memory::g_MemorySize;}
inline u32 PSP_GetKernelMemoryEnd() { return 0x08400000;} inline u32 PSP_GetKernelMemoryEnd() { return 0x08400000;}
// "Volatile" RAM is between 0x08400000 and 0x08800000, can be requested by the // "Volatile" RAM is between 0x08400000 and 0x08800000, can be requested by the
// game through sceKernelVolatileMemTryLock. // game through sceKernelVolatileMemTryLock.

28
Core/Util/PPGeDraw.h
View File

@ -46,18 +46,18 @@ void PPGeEnd();
void PPGeBindTexture(); void PPGeBindTexture();
enum { enum {
PPGE_ALIGN_LEFT = 0, PPGE_ALIGN_LEFT = 0,
PPGE_ALIGN_RIGHT = 16, PPGE_ALIGN_RIGHT = 16,
PPGE_ALIGN_TOP = 0, PPGE_ALIGN_TOP = 0,
PPGE_ALIGN_BOTTOM = 1, PPGE_ALIGN_BOTTOM = 1,
PPGE_ALIGN_HCENTER = 4, PPGE_ALIGN_HCENTER = 4,
PPGE_ALIGN_VCENTER = 8, PPGE_ALIGN_VCENTER = 8,
PPGE_ALIGN_VBASELINE = 32, // text only, possibly not yet working PPGE_ALIGN_VBASELINE = 32, // text only, possibly not yet working
PPGE_ALIGN_CENTER = PPGE_ALIGN_HCENTER | PPGE_ALIGN_VCENTER, PPGE_ALIGN_CENTER = PPGE_ALIGN_HCENTER | PPGE_ALIGN_VCENTER,
PPGE_ALIGN_TOPLEFT = PPGE_ALIGN_TOP | PPGE_ALIGN_LEFT, PPGE_ALIGN_TOPLEFT = PPGE_ALIGN_TOP | PPGE_ALIGN_LEFT,
PPGE_ALIGN_TOPRIGHT = PPGE_ALIGN_TOP | PPGE_ALIGN_RIGHT, PPGE_ALIGN_TOPRIGHT = PPGE_ALIGN_TOP | PPGE_ALIGN_RIGHT,
PPGE_ALIGN_BOTTOMLEFT = PPGE_ALIGN_BOTTOM | PPGE_ALIGN_LEFT, PPGE_ALIGN_BOTTOMLEFT = PPGE_ALIGN_BOTTOM | PPGE_ALIGN_LEFT,
PPGE_ALIGN_BOTTOMRIGHT = PPGE_ALIGN_BOTTOM | PPGE_ALIGN_RIGHT, PPGE_ALIGN_BOTTOMRIGHT = PPGE_ALIGN_BOTTOM | PPGE_ALIGN_RIGHT,
}; };
@ -67,10 +67,10 @@ enum {
}; };
enum { enum {
PPGE_LINE_NONE = 0, PPGE_LINE_NONE = 0,
PPGE_LINE_USE_ELLIPSIS = 1, // use ellipses in too long words PPGE_LINE_USE_ELLIPSIS = 1, // use ellipses in too long words
PPGE_LINE_WRAP_WORD = 2, PPGE_LINE_WRAP_WORD = 2,
PPGE_LINE_WRAP_CHAR = 4, PPGE_LINE_WRAP_CHAR = 4,
}; };
// Get the metrics of the bounding box of the text without changing the buffer or state. // Get the metrics of the bounding box of the text without changing the buffer or state.