schihei/llama2.c
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced __int64 with int64_t and DWORD with uint_32

Browse Source
This commit is contained in:
Ruhollah Majdoddin
2023-08-02 10:18:30 +02:00
parent a8f3e1c499
commit f50804a5ae
2 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win.c
+14 -14
View File
@@ -6,7 +6,7 @@
#define FILE_MAP_EXECUTE 0x0020 #define FILE_MAP_EXECUTE 0x0020
#endif /* FILE_MAP_EXECUTE */ #endif /* FILE_MAP_EXECUTE */
static int __map_mman_error(const DWORD err, const int deferr) static int __map_mman_error(const uint32_t err, const int deferr)
{ {
if (err == 0) if (err == 0)
return 0; return 0;
@@ -14,9 +14,9 @@ static int __map_mman_error(const DWORD err, const int deferr)
return err; return err;
} }
static DWORD __map_mmap_prot_page(const int prot) static uint32_t __map_mmap_prot_page(const int prot)
{ {
DWORD protect = 0; uint32_t protect = 0;
if (prot == PROT_NONE) if (prot == PROT_NONE)
return protect; return protect;
@@ -35,9 +35,9 @@ static DWORD __map_mmap_prot_page(const int prot)
return protect; return protect;
} }
static DWORD __map_mmap_prot_file(const int prot) static uint32_t __map_mmap_prot_file(const int prot)
{ {
DWORD desiredAccess = 0; uint32_t desiredAccess = 0;
if (prot == PROT_NONE) if (prot == PROT_NONE)
return desiredAccess; return desiredAccess;
@@ -62,15 +62,15 @@ void* mmap(void *addr, size_t len, int prot, int flags, int fildes, ssize_t off)
#pragma warning(disable: 4293) #pragma warning(disable: 4293)
#endif #endif
const DWORD dwFileOffsetLow = (DWORD)(off & 0xFFFFFFFFL); const uint32_t dwFileOffsetLow = (uint32_t)(off & 0xFFFFFFFFL);
const DWORD dwFileOffsetHigh = (DWORD)((off >> 32) & 0xFFFFFFFFL); const uint32_t dwFileOffsetHigh = (uint32_t)((off >> 32) & 0xFFFFFFFFL);
const DWORD protect = __map_mmap_prot_page(prot); const uint32_t protect = __map_mmap_prot_page(prot);
const DWORD desiredAccess = __map_mmap_prot_file(prot); const uint32_t desiredAccess = __map_mmap_prot_file(prot);
const ssize_t maxSize = off + (ssize_t)len; const ssize_t maxSize = off + (ssize_t)len;
const DWORD dwMaxSizeLow = (DWORD)(maxSize & 0xFFFFFFFFL); const uint32_t dwMaxSizeLow = (uint32_t)(maxSize & 0xFFFFFFFFL);
const DWORD dwMaxSizeHigh = (DWORD)((maxSize >> 32) & 0xFFFFFFFFL); const uint32_t dwMaxSizeHigh = (uint32_t)((maxSize >> 32) & 0xFFFFFFFFL);
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
@@ -130,8 +130,8 @@ int munmap(void *addr, size_t len)
int mprotect(void *addr, size_t len, int prot) int mprotect(void *addr, size_t len, int prot)
{ {
DWORD newProtect = __map_mmap_prot_page(prot); uint32_t newProtect = __map_mmap_prot_page(prot);
DWORD oldProtect = 0; uint32_t oldProtect = 0;
if (VirtualProtect(addr, len, newProtect, &oldProtect)) if (VirtualProtect(addr, len, newProtect, &oldProtect))
return 0; return 0;
@@ -173,7 +173,7 @@ int munlock(const void *addr, size_t len)
// Portable clock_gettime function for Windows // Portable clock_gettime function for Windows
int clock_gettime(int clk_id, struct timespec *tp) { int clock_gettime(int clk_id, struct timespec *tp) {
DWORD ticks = GetTickCount(); uint32_t ticks = GetTickCount();
tp->tv_sec = ticks / 1000; tp->tv_sec = ticks / 1000;
tp->tv_nsec = (ticks % 1000) * 1000000; tp->tv_nsec = (ticks % 1000) * 1000000;
return 0; return 0;
win.h
+2 -1
View File
@@ -4,8 +4,9 @@
#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
#include <windows.h> #include <windows.h>
#include <time.h> #include <time.h>
#include <stdint.h>
#define ssize_t __int64 #define ssize_t int64_t
#define ftell _ftelli64 #define ftell _ftelli64
// Below code is originally from mman-win32 // Below code is originally from mman-win32