Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 05:19:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

We don't need a third set of sized integer typedefs, get rid of it.

Browse Source
This commit is contained in:
Henrik Rydgard 2015-09-06 19:10:08 +02:00
parent 926c03574c
commit 1c67de0c21
8 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Common/Arm64Emitter.cpp
View File

@ -3517,11 +3517,11 @@ void ARM64FloatEmitter::UXTL2(u8 src_size, ARM64Reg Rd, ARM64Reg Rn)
UXTL(src_size, Rd, Rn, true);
}
static uint32 EncodeImmShiftLeft(u8 src_size, u32 shift) {
static u32 EncodeImmShiftLeft(u8 src_size, u32 shift) {
return src_size + shift;
}
static uint32 EncodeImmShiftRight(u8 src_size, u32 shift) {
static u32 EncodeImmShiftRight(u8 src_size, u32 shift) {
return src_size * 2 - shift;
}

2
Common/CPUDetect.cpp
View File

@ -29,6 +29,8 @@
#include "StringUtils.h"
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
#include <Windows.h>
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
#define _interlockedbittestandset64 workaround_ms_header_bug_platform_sdk6_set64

2
Core/HLE/proAdhoc.cpp
View File

@ -1475,7 +1475,7 @@ bool isBroadcastMAC(const SceNetEtherAddr * addr) {
bool resolveIP(uint32_t ip, SceNetEtherAddr * mac) {
sockaddr_in addr;
getLocalIp(&addr);
uint32 localIp = addr.sin_addr.s_addr;
uint32_t localIp = addr.sin_addr.s_addr;
if (ip == localIp){
getLocalMac(mac);

2
Core/HLE/sceNetAdhoc.cpp
View File

@ -392,7 +392,7 @@ static int sceNetAdhocPdpSend(int id, const char *mac, u32 port, void *data, int
return -1;
}
SceNetEtherAddr * daddr = (SceNetEtherAddr *)mac;
uint16 dport = (uint16)port;
uint16_t dport = (uint16_t)port;
//if (dport < 7) dport += 1341;

10
Core/MIPS/MIPSDebugInterface.cpp
View File

@ -45,7 +45,7 @@ class MipsExpressionFunctions: public IExpressionFunctions
public:
MipsExpressionFunctions(DebugInterface* cpu): cpu(cpu) { };
bool parseReference(char* str, uint32& referenceIndex) override
bool parseReference(char* str, uint32_t& referenceIndex) override
{
for (int i = 0; i < 32; i++)
{
@ -109,12 +109,12 @@ public:
return false;
}
bool parseSymbol(char* str, uint32& symbolValue) override
bool parseSymbol(char* str, uint32_t& symbolValue) override
{
return symbolMap.GetLabelValue(str,symbolValue);
}
uint32 getReferenceValue(uint32 referenceIndex) override
uint32_t getReferenceValue(uint32_t referenceIndex) override
{
if (referenceIndex < 32)
return cpu->GetRegValue(0, referenceIndex);
@ -131,14 +131,14 @@ public:
return -1;
}
ExpressionType getReferenceType(uint32 referenceIndex) override {
ExpressionType getReferenceType(uint32_t referenceIndex) override {
if (referenceIndex & REF_INDEX_IS_FLOAT) {
return EXPR_TYPE_FLOAT;
}
return EXPR_TYPE_UINT;
}
bool getMemoryValue(uint32 address, int size, uint32& dest, char* error) override
bool getMemoryValue(uint32_t address, int size, uint32_t& dest, char* error) override
{
switch (size)
{

4
Core/Screenshot.cpp
View File

@ -68,7 +68,7 @@ private:
FILE *fp_;
};
static bool WriteScreenshotToJPEG(const char *filename, int width, int height, int num_channels, const uint8 *image_data, const jpge::params &comp_params) {
static bool WriteScreenshotToJPEG(const char *filename, int width, int height, int num_channels, const uint8_t *image_data, const jpge::params &comp_params) {
JPEGFileStream dst_stream(filename);
if (!dst_stream.Valid()) {
ERROR_LOG(COMMON, "Unable to open screenshot file for writing.");
@ -83,7 +83,7 @@ static bool WriteScreenshotToJPEG(const char *filename, int width, int height, i
for (u32 pass_index = 0; pass_index < dst_image.get_total_passes(); pass_index++) {
for (int i = 0; i < height; i++) {
const uint8 *buf = image_data + i * width * num_channels;
const uint8_t *buf = image_data + i * width * num_channels;
if (!dst_image.process_scanline(buf)) {
ERROR_LOG(COMMON, "Screenshot JPEG encode scanline failed.");
return false;

1
Windows/WndMainWindow.cpp
View File

@ -20,6 +20,7 @@
#include "Common/CommonWindows.h"
#include "Common/KeyMap.h"
#include <Windowsx.h>
#include <map>
#include <string>

2
native

@ -1 +1 @@
Subproject commit 9ce1822a8362e9d886b56f157bbe272dc740704b
Subproject commit 18ce2262d6f93aa3715190aeb6e31b00e0eab2d4