forked from 0ad/0ad
janwas
c0ed950657
this snowballed into a massive search+destroy of the hodgepodge of mostly equivalent types we had in use (int, uint, unsigned, unsigned int, i32, u32, ulong, uintN). it is more efficient to use 64-bit types in 64-bit mode, so the preferred default is size_t (for anything remotely resembling a size or index). tile coordinates are ssize_t to allow more efficient conversion to/from floating point. flags are int because we almost never need more than 15 distinct bits, bit test/set is not slower and int is fastest to type. finally, some data that is pretty much directly passed to OpenGL is now typed accordingly. after several hours, the code now requires fewer casts and less guesswork. other changes: - unit and player IDs now have an "invalid id" constant in the respective class to avoid casting and -1 - fix some endian/64-bit bugs in the map (un)packing. added a convenience function to write/read a size_t. - ia32: change CPUID interface to allow passing in ecx (required for cache topology detection, which I need at work). remove some unneeded functions from asm, replace with intrinsics where possible. This was SVN commit r5942.
60 lines
1.6 KiB
C++
60 lines
1.6 KiB
C++
/**
|
|
* =========================================================================
|
|
* File : fat_time.cpp
|
|
* Project : 0 A.D.
|
|
* Description : timestamp conversion: DOS FAT <-> Unix time_t
|
|
* =========================================================================
|
|
*/
|
|
|
|
// license: GPL; see lib/license.txt
|
|
|
|
#include "precompiled.h"
|
|
#include "fat_time.h"
|
|
|
|
#include <ctime>
|
|
|
|
#include "lib/bits.h"
|
|
|
|
|
|
time_t time_t_from_FAT(u32 fat_timedate)
|
|
{
|
|
const u32 fat_time = bits(fat_timedate, 0, 15);
|
|
const u32 fat_date = bits(fat_timedate, 16, 31);
|
|
|
|
struct tm t; // struct tm format:
|
|
t.tm_sec = bits(fat_time, 0,4) * 2; // [0,59]
|
|
t.tm_min = bits(fat_time, 5,10); // [0,59]
|
|
t.tm_hour = bits(fat_time, 11,15); // [0,23]
|
|
t.tm_mday = bits(fat_date, 0,4); // [1,31]
|
|
t.tm_mon = bits(fat_date, 5,8) - 1; // [0,11]
|
|
t.tm_year = bits(fat_date, 9,15) + 80; // since 1900
|
|
t.tm_isdst = -1; // unknown - let libc determine
|
|
|
|
// otherwise: totally bogus, and at the limit of 32-bit time_t
|
|
debug_assert(t.tm_year < 138);
|
|
|
|
time_t ret = mktime(&t);
|
|
debug_assert(ret != (time_t)-1); // mktime shouldn't fail
|
|
return ret;
|
|
}
|
|
|
|
|
|
u32 FAT_from_time_t(time_t time)
|
|
{
|
|
// (values are adjusted for DST)
|
|
struct tm* t = localtime(&time);
|
|
|
|
u16 fat_time = 0;
|
|
fat_time |= (t->tm_sec/2); // 5
|
|
fat_time |= (t->tm_min) << 5; // 6
|
|
fat_time |= (t->tm_hour) << 11; // 5
|
|
|
|
u16 fat_date = 0;
|
|
fat_date |= (t->tm_mday); // 5
|
|
fat_date |= (t->tm_mon+1) << 5; // 4
|
|
fat_date |= (t->tm_year-80) << 9; // 7
|
|
|
|
u32 fat_timedate = u32_from_u16(fat_date, fat_time);
|
|
return fat_timedate;
|
|
}
|