ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixing (or at least improving) TLS.

This commit is contained in:
Ben Vanik 2015-06-04 16:51:53 -07:00
parent 319402a11a
commit 21474970b2
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/xenia/kernel/objects/xthread.cc
View File

@ -173,28 +173,35 @@ X_STATUS XThread::Create() {
scratch_address_ = memory()->SystemHeapAlloc(scratch_size_); scratch_address_ = memory()->SystemHeapAlloc(scratch_size_);
// Allocate TLS block. // Allocate TLS block.
uint32_t tls_size = 32; // Default 32 (is this OK?) // Games will specify a certain number of 4b slots that each thread will get.
const uint32_t kDefaultTlsSlotCount = 32;
uint32_t tls_slots = 0;
uint32_t tls_extended_size = 0;
if (module && module->xex_header()) { if (module && module->xex_header()) {
const xe_xex2_header_t* header = module->xex_header(); const xe_xex2_header_t* header = module->xex_header();
tls_slots = header->tls_info.slot_count ? header->tls_info.slot_count : kDefaultTlsSlotCount;
// FIXME: Is this correct? tls_extended_size = header->tls_info.data_size;
tls_size = header->tls_info.data_size; } else {
tls_slots = kDefaultTlsSlotCount;
} }
// Allocate both the slots and the extended data.
uint32_t tls_size = tls_slots * 4 + tls_extended_size;
tls_address_ = memory()->SystemHeapAlloc(tls_size); tls_address_ = memory()->SystemHeapAlloc(tls_size);
if (!tls_address_) { if (!tls_address_) {
XELOGW("Unable to allocate thread local storage block"); XELOGW("Unable to allocate thread local storage block");
return X_STATUS_NO_MEMORY; return X_STATUS_NO_MEMORY;
} }
// Copy in default TLS info (or zero it out) // Zero all of TLS.
if (module && module->xex_header()) { memory()->Fill(tls_address_, tls_size, 0);
if (tls_extended_size) {
// If game has extended data, copy in the default values.
const xe_xex2_header_t* header = module->xex_header(); const xe_xex2_header_t* header = module->xex_header();
assert_not_zero(header->tls_info.raw_data_address);
// Copy in default TLS info. // TODO(benvanik): verify location relative to slots.
memory()->Copy(tls_address_, header->tls_info.raw_data_address, header->tls_info.data_size); memory()->Copy(tls_address_ + tls_size, header->tls_info.raw_data_address,
} else { header->tls_info.raw_data_size);
memory()->Fill(tls_address_, tls_size, 0);
} }
// Allocate processor thread state. // Allocate processor thread state.