Skip to content

Commit bb0a348

Browse files
committed
refactor gsc vm/gdb registry
1 parent 57bef85 commit bb0a348

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1092
-1095
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ scripts/antlr4.jar
3636
*.aps
3737

3838
# Private stuff
39-
src/acts/tools/gsc/vm/vm_private_*.cpp
39+
src/acts/tools/gsc/vm/gsc_vm_private_*.cpp
4040
src/**/_private_*.cpp
4141
# VS
4242
/.vs/

src/acts/mods/t9_custom_ee.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <includes.hpp>
22
#include "custom_ees.hpp"
33
#include <tools/cw/cw.hpp>
4-
#include <tools/gsc/vm/vm_t9.hpp>
4+
#include <tools/gsc/data/gsc_data_t9.hpp>
55

66
struct XAssetPool {
77
uintptr_t pool; // void*

src/acts/tools/bo3/bo3.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <includes.hpp>
22
#include <tools/bo3/bo3.hpp>
33
#include <tools/bo3/pools.hpp>
4-
#include <tools/gsc/vm/vm_t7.hpp>
4+
#include <tools/gsc/data/gsc_data_t7.hpp>
55
#include <core/bytebuffer.hpp>
66

77
namespace bo3 {

src/acts/tools/cw/cw.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <hook/module_mapper.hpp>
33
#include <tools/cw/cw.hpp>
44
#include <tools/cw/pool_cod2020.hpp>
5-
#include <tools/gsc/vm/vm_t9.hpp>
5+
#include <tools/gsc/data/gsc_data_t9.hpp>
66
//#include "tools/gsc/gsc.hpp"
77

88
static const char* cwBgNames[]{

src/acts/tools/exe_mapper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ namespace {
276276
continue; // ignore
277277
}
278278

279-
auto* hbuilder{ tool::gsc::GetGscReader(nfo->vmMagic) };
279+
auto* hbuilder{ tool::gsc::vm::GetGscReader(nfo->vmMagic) };
280280

281281
if (!hbuilder) {
282282
LOG_ERROR("Can't read {}: No gsc handler builder for vm {}", path.string(), nfo->name);
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,4 @@ namespace tool::gsc {
5959
uint32_t address_str1;
6060
uint32_t address_str2;
6161
};
62-
6362
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#pragma once
22

33
namespace tool::gsc {
4+
45
struct GscObj24 {
56
byte magic[8];
67
uint64_t name;
@@ -46,4 +47,5 @@ namespace tool::gsc {
4647
uint8_t param_count;
4748
uint8_t flags;
4849
};
50+
4951
}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#pragma once
32

43
namespace tool::gsc {
54
struct T6GscObj {
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace tool::gsc {
3333
GET_CALL = 0x20,
3434
LOCAL_CALL = 0x40
3535
};
36-
36+
3737
struct T831GSCOBJ {
3838
byte magic[8];
3939
uint32_t source_crc;
@@ -93,7 +93,7 @@ namespace tool::gsc {
9393
byte flags;
9494
byte requires_implements_count;
9595
};
96-
96+
9797
struct T8GSCFixup {
9898
uintptr_t offset;
9999
uintptr_t address;
@@ -122,4 +122,5 @@ namespace tool::gsc {
122122
uint8_t flags;
123123
uint16_t padding;
124124
};
125+
125126
}

0 commit comments

Comments
 (0)