diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 4 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpdouble.cpp | 28 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpsingle.cpp | 28 | ||||
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 2 |
4 files changed, 31 insertions, 31 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 77af10b54..76408e9fa 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp @@ -206,7 +206,7 @@ static const char *opcode_names[] = { "swi", "tst", - NULL + nullptr }; // Indexed by the shift type (bits 6-5) @@ -399,7 +399,7 @@ std::string ARM_Disasm::Disassemble(u32 addr, u32 insn) default: return "Error"; } - return NULL; + return nullptr; } std::string ARM_Disasm::DisassembleALU(Opcode opcode, u32 insn) diff --git a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp index 47a9fe804..857e6ce45 100644 --- a/src/core/arm/skyeye_common/vfp/vfpdouble.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpdouble.cpp @@ -299,7 +299,7 @@ static u32 vfp_double_fsqrt(ARMul_State* state, int dd, int unused, int dm, u32 vdp = &vdd; if (tm & VFP_NAN) - ret = vfp_propagate_nan(vdp, &vdm, NULL, fpscr); + ret = vfp_propagate_nan(vdp, &vdm, nullptr, fpscr); else if (vdm.sign == 0) { sqrt_copy: vdp = &vdm; @@ -700,26 +700,26 @@ static struct op fops_ext[] = { { vfp_double_fabs, 0 }, //0x00000001 - FEXT_FABS { vfp_double_fneg, 0 }, //0x00000002 - FEXT_FNEG { vfp_double_fsqrt, 0 }, //0x00000003 - FEXT_FSQRT - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, { vfp_double_fcmp, OP_SCALAR }, //0x00000008 - FEXT_FCMP { vfp_double_fcmpe, OP_SCALAR }, //0x00000009 - FEXT_FCMPE { vfp_double_fcmpz, OP_SCALAR }, //0x0000000A - FEXT_FCMPZ { vfp_double_fcmpez, OP_SCALAR }, //0x0000000B - FEXT_FCMPEZ - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, { vfp_double_fcvts, OP_SCALAR|OP_DD }, //0x0000000F - FEXT_FCVT { vfp_double_fuito, OP_SCALAR|OP_SM }, //0x00000010 - FEXT_FUITO { vfp_double_fsito, OP_SCALAR|OP_SM }, //0x00000011 - FEXT_FSITO - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, { vfp_double_ftoui, OP_SCALAR|OP_SD }, //0x00000018 - FEXT_FTOUI { vfp_double_ftouiz, OP_SCALAR|OP_SD }, //0x00000019 - FEXT_FTOUIZ { vfp_double_ftosi, OP_SCALAR|OP_SD }, //0x0000001A - FEXT_FTOSI diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp index 0fb3c3bf1..e47ad2760 100644 --- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp @@ -341,7 +341,7 @@ static u32 vfp_single_fsqrt(ARMul_State* state, int sd, int unused, s32 m, u32 f vsp = &vsd; if (tm & VFP_NAN) - ret = vfp_propagate_nan(vsp, &vsm, NULL, fpscr); + ret = vfp_propagate_nan(vsp, &vsm, nullptr, fpscr); else if (vsm.sign == 0) { sqrt_copy: vsp = &vsm; @@ -725,26 +725,26 @@ static struct op fops_ext[] = { { vfp_single_fabs, 0 }, //0x00000001 - FEXT_FABS { vfp_single_fneg, 0 }, //0x00000002 - FEXT_FNEG { vfp_single_fsqrt, 0 }, //0x00000003 - FEXT_FSQRT - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, { vfp_single_fcmp, OP_SCALAR }, //0x00000008 - FEXT_FCMP { vfp_single_fcmpe, OP_SCALAR }, //0x00000009 - FEXT_FCMPE { vfp_single_fcmpz, OP_SCALAR }, //0x0000000A - FEXT_FCMPZ { vfp_single_fcmpez, OP_SCALAR }, //0x0000000B - FEXT_FCMPEZ - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, { vfp_single_fcvtd, OP_SCALAR|OP_DD }, //0x0000000F - FEXT_FCVT { vfp_single_fuito, OP_SCALAR }, //0x00000010 - FEXT_FUITO { vfp_single_fsito, OP_SCALAR }, //0x00000011 - FEXT_FSITO - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, - { NULL, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, + { nullptr, 0 }, { vfp_single_ftoui, OP_SCALAR }, //0x00000018 - FEXT_FTOUI { vfp_single_ftouiz, OP_SCALAR }, //0x00000019 - FEXT_FTOUIZ { vfp_single_ftosi, OP_SCALAR }, //0x0000001A - FEXT_FTOSI diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index d768a3fc7..633b66fe2 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -485,7 +485,7 @@ static void GetHostId(Service::Interface* self) { addrinfo* res; hints.ai_family = AF_INET; - getaddrinfo(name, NULL, &hints, &res); + getaddrinfo(name, nullptr, &hints, &res); sockaddr_in* sock_addr = reinterpret_cast<sockaddr_in*>(res->ai_addr); in_addr* addr = &sock_addr->sin_addr; |