Skip to content

Commit

Permalink
[Testing] Added test project for vfs
Browse files Browse the repository at this point in the history
- Added test case for: decode_fat_timestamp
- Changed location of: decode_fat_timestamp
  • Loading branch information
Gliniak authored and Triang3l committed Sep 14, 2023
1 parent c5e6352 commit 0f331b5
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 24 deletions.
24 changes: 0 additions & 24 deletions src/xenia/vfs/devices/stfs_container_device.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,9 @@
#include "xenia/base/math.h"
#include "xenia/vfs/devices/stfs_container_entry.h"

#if XE_PLATFORM_WIN32
#include "xenia/base/platform_win.h"
#define timegm _mkgmtime
#endif

namespace xe {
namespace vfs {

// Convert FAT timestamp to 100-nanosecond intervals since January 1, 1601 (UTC)
uint64_t decode_fat_timestamp(uint32_t date, uint32_t time) {
struct tm tm = {0};
// 80 is the difference between 1980 (FAT) and 1900 (tm);
tm.tm_year = ((0xFE00 & date) >> 9) + 80;
tm.tm_mon = (0x01E0 & date) >> 5;
tm.tm_mday = (0x001F & date) >> 0;
tm.tm_hour = (0xF800 & time) >> 11;
tm.tm_min = (0x07E0 & time) >> 5;
tm.tm_sec = (0x001F & time) << 1; // the value stored in 2-seconds intervals
tm.tm_isdst = 0;
time_t timet = timegm(&tm);
if (timet == -1) {
return 0;
}
// 11644473600LL is a difference between 1970 and 1601
return (timet + 11644473600LL) * 10000000;
}

StfsContainerDevice::StfsContainerDevice(const std::string_view mount_path,
const std::filesystem::path& host_path)
: Device(mount_path),
Expand Down
28 changes: 28 additions & 0 deletions src/xenia/vfs/devices/stfs_xbox.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,40 @@
#ifndef XENIA_VFS_DEVICES_STFS_XBOX_H_
#define XENIA_VFS_DEVICES_STFS_XBOX_H_

#include <time.h>

#include "xenia/xbox.h"
#include "xenia/base/string_util.h"
#include "xenia/kernel/util/xex2_info.h"

namespace xe {
namespace vfs {

// Convert FAT timestamp to 100-nanosecond intervals since January 1, 1601 (UTC)
inline uint64_t decode_fat_timestamp(const uint32_t date, const uint32_t time) {
struct tm tm = {0};
// 80 is the difference between 1980 (FAT) and 1900 (tm);
tm.tm_year = ((0xFE00 & date) >> 9) + 80;
tm.tm_mon = ((0x01E0 & date) >> 5);
tm.tm_mday = (0x001F & date) >> 0;
tm.tm_hour = (0xF800 & time) >> 11;
tm.tm_min = (0x07E0 & time) >> 5;
tm.tm_sec = (0x001F & time) << 1; // the value stored in 2-seconds intervals
tm.tm_isdst = 0;

#if XE_PLATFORM_WIN32
time_t timet = _mkgmtime(&tm);
#else
time_t timet = timegm(&tm);
#endif

if (timet == -1) {
return 0;
}
// 11644473600LL is a difference between 1970 and 1601
return (timet + 11644473600LL) * 10000000;
}

// Structs used for interchange between Xenia and actual Xbox360 kernel/XAM

inline uint32_t load_uint24_be(const uint8_t* p) {
Expand Down
1 change: 1 addition & 0 deletions src/xenia/vfs/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ project("xenia-vfs-dump")
resincludedirs({
project_root,
})
include("testing")

8 changes: 8 additions & 0 deletions src/xenia/vfs/testing/premake5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
project_root = "../../../.."
include(project_root.."/tools/build")

test_suite("xenia-vfs-tests", project_root, ".", {
links = {
"xenia-vfs",
},
})
28 changes: 28 additions & 0 deletions src/xenia/vfs/testing/vfs_test.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
******************************************************************************
* Xenia : Xbox 360 Emulator Research Project *
******************************************************************************
* Copyright 2023 Ben Vanik. All rights reserved. *
* Released under the BSD license - see LICENSE in the root for more details. *
******************************************************************************
*/

#include "xenia/vfs/devices/stfs_xbox.h"

#include "third_party/catch/include/catch.hpp"

namespace xe::vfs::test {

TEST_CASE("STFS Decode date and time", "[stfs_decode]") {
SECTION("10 June 2022 19:46:00 UTC - Decode") {
const uint16_t date = 0x54CA;
const uint16_t time = 0x9DBD;
const uint64_t result = 132993639580000000;

const uint64_t timestamp = decode_fat_timestamp(date, time);

REQUIRE(timestamp == result);
}
}

} // namespace xe::vfs::test

0 comments on commit 0f331b5

Please sign in to comment.