mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 03:03:22 +02:00
APT: Move the shared font loading and relocation functions to their own subdirectory services/apt/bcfnt.
This commit is contained in:
parent
5679d066b5
commit
abf8dcd700
@ -52,6 +52,7 @@ set(SRCS
|
|||||||
hle/service/apt/apt_a.cpp
|
hle/service/apt/apt_a.cpp
|
||||||
hle/service/apt/apt_s.cpp
|
hle/service/apt/apt_s.cpp
|
||||||
hle/service/apt/apt_u.cpp
|
hle/service/apt/apt_u.cpp
|
||||||
|
hle/service/apt/bcfnt/bcfnt.cpp
|
||||||
hle/service/boss/boss.cpp
|
hle/service/boss/boss.cpp
|
||||||
hle/service/boss/boss_p.cpp
|
hle/service/boss/boss_p.cpp
|
||||||
hle/service/boss/boss_u.cpp
|
hle/service/boss/boss_u.cpp
|
||||||
@ -185,6 +186,7 @@ set(HEADERS
|
|||||||
hle/service/apt/apt_a.h
|
hle/service/apt/apt_a.h
|
||||||
hle/service/apt/apt_s.h
|
hle/service/apt/apt_s.h
|
||||||
hle/service/apt/apt_u.h
|
hle/service/apt/apt_u.h
|
||||||
|
hle/service/apt/bcfnt/bcfnt.h
|
||||||
hle/service/boss/boss.h
|
hle/service/boss/boss.h
|
||||||
hle/service/boss/boss_p.h
|
hle/service/boss/boss_p.h
|
||||||
hle/service/boss/boss_u.h
|
hle/service/boss/boss_u.h
|
||||||
|
@ -12,6 +12,7 @@
|
|||||||
#include "core/hle/service/apt/apt_a.h"
|
#include "core/hle/service/apt/apt_a.h"
|
||||||
#include "core/hle/service/apt/apt_s.h"
|
#include "core/hle/service/apt/apt_s.h"
|
||||||
#include "core/hle/service/apt/apt_u.h"
|
#include "core/hle/service/apt/apt_u.h"
|
||||||
|
#include "core/hle/service/apt/bcfnt/bcfnt.h"
|
||||||
#include "core/hle/service/fs/archive.h"
|
#include "core/hle/service/fs/archive.h"
|
||||||
|
|
||||||
#include "core/hle/kernel/event.h"
|
#include "core/hle/kernel/event.h"
|
||||||
@ -22,70 +23,6 @@
|
|||||||
namespace Service {
|
namespace Service {
|
||||||
namespace APT {
|
namespace APT {
|
||||||
|
|
||||||
/// BCFNT Shared Font file structures
|
|
||||||
namespace BCFNT {
|
|
||||||
struct CFNT {
|
|
||||||
u8 magic[4];
|
|
||||||
u16_le endianness;
|
|
||||||
u16_le header_size;
|
|
||||||
u32_le version;
|
|
||||||
u32_le file_size;
|
|
||||||
u32_le num_blocks;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct FINF {
|
|
||||||
u8 magic[4];
|
|
||||||
u32_le section_size;
|
|
||||||
u8 font_type;
|
|
||||||
u8 line_feed;
|
|
||||||
u16_le alter_char_index;
|
|
||||||
u8 default_width[3];
|
|
||||||
u8 encoding;
|
|
||||||
u32_le tglp_offset;
|
|
||||||
u32_le cwdh_offset;
|
|
||||||
u32_le cmap_offset;
|
|
||||||
u8 height;
|
|
||||||
u8 width;
|
|
||||||
u8 ascent;
|
|
||||||
u8 reserved;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct TGLP {
|
|
||||||
u8 magic[4];
|
|
||||||
u32_le section_size;
|
|
||||||
u8 cell_width;
|
|
||||||
u8 cell_height;
|
|
||||||
u8 baseline_position;
|
|
||||||
u8 max_character_width;
|
|
||||||
u32_le sheet_size;
|
|
||||||
u16_le num_sheets;
|
|
||||||
u16_le sheet_image_format;
|
|
||||||
u16_le num_columns;
|
|
||||||
u16_le num_rows;
|
|
||||||
u16_le sheet_width;
|
|
||||||
u16_le sheet_height;
|
|
||||||
u32_le sheet_data_offset;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct CMAP {
|
|
||||||
u8 magic[4];
|
|
||||||
u32_le section_size;
|
|
||||||
u16_le code_begin;
|
|
||||||
u16_le code_end;
|
|
||||||
u16_le mapping_method;
|
|
||||||
u16_le reserved;
|
|
||||||
u32_le next_cmap_offset;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct CWDH {
|
|
||||||
u8 magic[4];
|
|
||||||
u32_le section_size;
|
|
||||||
u16_le start_index;
|
|
||||||
u16_le end_index;
|
|
||||||
u32_le next_cwdh_offset;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Handle to shared memory region designated to for shared system font
|
/// Handle to shared memory region designated to for shared system font
|
||||||
static Kernel::SharedPtr<Kernel::SharedMemory> shared_font_mem;
|
static Kernel::SharedPtr<Kernel::SharedMemory> shared_font_mem;
|
||||||
static bool shared_font_relocated = false;
|
static bool shared_font_relocated = false;
|
||||||
@ -133,9 +70,13 @@ void GetSharedFont(Service::Interface* self) {
|
|||||||
VAddr target_address = Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address);
|
VAddr target_address = Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address);
|
||||||
// The shared font dumped by 3dsutils (https://github.com/citra-emu/3dsutils) uses this address as base,
|
// The shared font dumped by 3dsutils (https://github.com/citra-emu/3dsutils) uses this address as base,
|
||||||
// so we relocate it from there to our real address.
|
// so we relocate it from there to our real address.
|
||||||
|
// TODO(Subv): This address is wrong if the shared font is dumped from a n3DS,
|
||||||
|
// we need a way to automatically calculate the original address of the font from the file.
|
||||||
static const VAddr SHARED_FONT_VADDR = 0x18000000;
|
static const VAddr SHARED_FONT_VADDR = 0x18000000;
|
||||||
if (!shared_font_relocated)
|
if (!shared_font_relocated) {
|
||||||
RelocateSharedFont(SHARED_FONT_VADDR, target_address);
|
BCFNT::RelocateSharedFont(shared_font_mem, SHARED_FONT_VADDR, target_address);
|
||||||
|
shared_font_relocated = true;
|
||||||
|
}
|
||||||
cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2);
|
cmd_buff[0] = IPC::MakeHeader(0x44, 2, 2);
|
||||||
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
cmd_buff[1] = RESULT_SUCCESS.raw; // No error
|
||||||
// Since the SharedMemory interface doesn't provide the address at which the memory was allocated,
|
// Since the SharedMemory interface doesn't provide the address at which the memory was allocated,
|
||||||
|
71
src/core/hle/service/apt/bcfnt/bcfnt.cpp
Normal file
71
src/core/hle/service/apt/bcfnt/bcfnt.cpp
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
// Copyright 2016 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#include "core/hle/service/apt/bcfnt/bcfnt.h"
|
||||||
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace APT {
|
||||||
|
namespace BCFNT {
|
||||||
|
|
||||||
|
void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAddr previous_address, VAddr new_address) {
|
||||||
|
static const u32 SharedFontStartOffset = 0x80;
|
||||||
|
u8* data = shared_font->GetPointer(SharedFontStartOffset);
|
||||||
|
|
||||||
|
CFNT cfnt;
|
||||||
|
memcpy(&cfnt, data, sizeof(cfnt));
|
||||||
|
|
||||||
|
// Advance past the header
|
||||||
|
data = shared_font->GetPointer(SharedFontStartOffset + cfnt.header_size);
|
||||||
|
|
||||||
|
for (unsigned block = 0; block < cfnt.num_blocks; ++block) {
|
||||||
|
|
||||||
|
u32 section_size = 0;
|
||||||
|
if (memcmp(data, "FINF", 4) == 0) {
|
||||||
|
BCFNT::FINF finf;
|
||||||
|
memcpy(&finf, data, sizeof(finf));
|
||||||
|
section_size = finf.section_size;
|
||||||
|
|
||||||
|
// Relocate the offsets in the FINF section
|
||||||
|
finf.cmap_offset += new_address - previous_address;
|
||||||
|
finf.cwdh_offset += new_address - previous_address;
|
||||||
|
finf.tglp_offset += new_address - previous_address;
|
||||||
|
|
||||||
|
memcpy(data, &finf, sizeof(finf));
|
||||||
|
} else if (memcmp(data, "CMAP", 4) == 0) {
|
||||||
|
BCFNT::CMAP cmap;
|
||||||
|
memcpy(&cmap, data, sizeof(cmap));
|
||||||
|
section_size = cmap.section_size;
|
||||||
|
|
||||||
|
// Relocate the offsets in the CMAP section
|
||||||
|
cmap.next_cmap_offset += new_address - previous_address;
|
||||||
|
|
||||||
|
memcpy(data, &cmap, sizeof(cmap));
|
||||||
|
} else if (memcmp(data, "CWDH", 4) == 0) {
|
||||||
|
BCFNT::CWDH cwdh;
|
||||||
|
memcpy(&cwdh, data, sizeof(cwdh));
|
||||||
|
section_size = cwdh.section_size;
|
||||||
|
|
||||||
|
// Relocate the offsets in the CWDH section
|
||||||
|
cwdh.next_cwdh_offset += new_address - previous_address;
|
||||||
|
|
||||||
|
memcpy(data, &cwdh, sizeof(cwdh));
|
||||||
|
} else if (memcmp(data, "TGLP", 4) == 0) {
|
||||||
|
BCFNT::TGLP tglp;
|
||||||
|
memcpy(&tglp, data, sizeof(tglp));
|
||||||
|
section_size = tglp.section_size;
|
||||||
|
|
||||||
|
// Relocate the offsets in the TGLP section
|
||||||
|
tglp.sheet_data_offset += new_address - previous_address;
|
||||||
|
|
||||||
|
memcpy(data, &tglp, sizeof(tglp));
|
||||||
|
}
|
||||||
|
|
||||||
|
data += section_size;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace BCFNT
|
||||||
|
} // namespace APT
|
||||||
|
} // namespace Service
|
87
src/core/hle/service/apt/bcfnt/bcfnt.h
Normal file
87
src/core/hle/service/apt/bcfnt/bcfnt.h
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
// Copyright 2016 Citra Emulator Project
|
||||||
|
// Licensed under GPLv2 or any later version
|
||||||
|
// Refer to the license.txt file included.
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "common/swap.h"
|
||||||
|
|
||||||
|
#include "core/hle/kernel/shared_memory.h"
|
||||||
|
#include "core/hle/service/service.h"
|
||||||
|
|
||||||
|
namespace Service {
|
||||||
|
namespace APT {
|
||||||
|
namespace BCFNT { ///< BCFNT Shared Font file structures
|
||||||
|
|
||||||
|
struct CFNT {
|
||||||
|
u8 magic[4];
|
||||||
|
u16_le endianness;
|
||||||
|
u16_le header_size;
|
||||||
|
u32_le version;
|
||||||
|
u32_le file_size;
|
||||||
|
u32_le num_blocks;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct FINF {
|
||||||
|
u8 magic[4];
|
||||||
|
u32_le section_size;
|
||||||
|
u8 font_type;
|
||||||
|
u8 line_feed;
|
||||||
|
u16_le alter_char_index;
|
||||||
|
u8 default_width[3];
|
||||||
|
u8 encoding;
|
||||||
|
u32_le tglp_offset;
|
||||||
|
u32_le cwdh_offset;
|
||||||
|
u32_le cmap_offset;
|
||||||
|
u8 height;
|
||||||
|
u8 width;
|
||||||
|
u8 ascent;
|
||||||
|
u8 reserved;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct TGLP {
|
||||||
|
u8 magic[4];
|
||||||
|
u32_le section_size;
|
||||||
|
u8 cell_width;
|
||||||
|
u8 cell_height;
|
||||||
|
u8 baseline_position;
|
||||||
|
u8 max_character_width;
|
||||||
|
u32_le sheet_size;
|
||||||
|
u16_le num_sheets;
|
||||||
|
u16_le sheet_image_format;
|
||||||
|
u16_le num_columns;
|
||||||
|
u16_le num_rows;
|
||||||
|
u16_le sheet_width;
|
||||||
|
u16_le sheet_height;
|
||||||
|
u32_le sheet_data_offset;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct CMAP {
|
||||||
|
u8 magic[4];
|
||||||
|
u32_le section_size;
|
||||||
|
u16_le code_begin;
|
||||||
|
u16_le code_end;
|
||||||
|
u16_le mapping_method;
|
||||||
|
u16_le reserved;
|
||||||
|
u32_le next_cmap_offset;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct CWDH {
|
||||||
|
u8 magic[4];
|
||||||
|
u32_le section_size;
|
||||||
|
u16_le start_index;
|
||||||
|
u16_le end_index;
|
||||||
|
u32_le next_cwdh_offset;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Relocates the internal addresses of the BCFNT Shared Font to the new base.
|
||||||
|
* @param shared_font SharedMemory object that contains the Shared Font
|
||||||
|
* @param previous_address Previous address at which the offsets in the structure were based.
|
||||||
|
* @param new_address New base for the offsets in the structure.
|
||||||
|
*/
|
||||||
|
void RelocateSharedFont(Kernel::SharedPtr<Kernel::SharedMemory> shared_font, VAddr previous_address, VAddr new_address);
|
||||||
|
|
||||||
|
} // namespace BCFNT
|
||||||
|
} // namespace APT
|
||||||
|
} // namespace Service
|
Loading…
Reference in New Issue
Block a user