Emulation/DobieStation
1
0
Fork 0
mirror of https://github.com/PSI-Rockin/DobieStation.git synced 2024-06-02 03:18:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

CHD: clean up debugging prints

Browse source
This commit is contained in:
Ziemas 2020-12-29 13:31:27 +01:00
parent 1b7377330d
commit a88d75ceb7
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/core/iop/cdvd/chd_reader.cpp
View file

@ -12,18 +12,12 @@ bool CHD_Reader::open(std::string name)
}
m_header = chd_get_header(m_file);
printf("chd: opened file %s\n", name.c_str());
m_size = m_header->logicalbytes;
printf("chd: size %zd\n", m_size);
m_buf = std::make_unique<uint8_t[]>(m_header->hunkbytes);
printf("chd: hunk size %d\n", m_header->hunkbytes);
printf("chd: unitbytes %d\n", m_header->unitbytes);
find_offset();
// read first hunk
// read first hunk in advance
err = chd_read(m_file, 0, m_buf.get());
if (err != CHDERR_NONE)
{
@ -74,7 +68,6 @@ void CHD_Reader::find_offset()
void CHD_Reader::close()
{
printf("chd: close");
chd_close(m_file);
delete (m_header);
}
@ -84,29 +77,20 @@ size_t CHD_Reader::read(uint8_t* buff, size_t bytes)
assert(bytes);
assert(m_virtptr + bytes <= m_size);
printf("chd: reading %zd bytes from %lu\n", bytes, m_virtptr);
const uint64_t start = m_virtptr;
const uint64_t end = start + bytes;
uint64_t start_hunk = start / m_header->hunkbytes;
uint64_t end_hunk = end / m_header->hunkbytes;
printf("chd: start %lu\n", start);
printf("chd: start_hunk %lu\n", start_hunk);
printf("chd: end %lu\n", end);
printf("chd: end_hunk %lu\n", end_hunk);
uint64_t total_read = 0;
for (uint32_t i = (uint32_t)start_hunk; i <= end_hunk; i++)
{
if (i != m_current_hunk)
{
printf("chd: grabbing new hunk %d\n", i);
chd_error err = chd_read(m_file, i, m_buf.get());
if (err != CHDERR_NONE)
{
fprintf(stderr, "chd: read %s\n", chd_error_string(err));
fprintf(stderr, "chd: read: %s\n", chd_error_string(err));
return total_read;
}
@ -115,16 +99,12 @@ size_t CHD_Reader::read(uint8_t* buff, size_t bytes)
const uint64_t local_ofs = start - (uint64_t)start_hunk * m_header->hunkbytes;
uint64_t readlen = m_header->hunkbytes;
printf("chd: readlen %lu\n", readlen);
printf("chd: local_ofs %lu\n", local_ofs);
if (i == start_hunk)
readlen -= local_ofs;
if (i == end_hunk)
readlen -= m_header->hunkbytes - (end - (uint64_t)end_hunk * m_header->hunkbytes);
printf("chd: readlen %lu\n", readlen);
assert(readlen <= bytes);
memcpy(buff, m_buf.get() + local_ofs + m_sector_offset, readlen);
@ -138,14 +118,11 @@ size_t CHD_Reader::read(uint8_t* buff, size_t bytes)
buff += readlen;
}
printf("chd: read %lu\n", total_read);
return total_read;
}
void CHD_Reader::seek(size_t ofs, std::ios::seekdir whence)
{
printf("chd: seek to sector %zd, bytes %lu\n", ofs, ofs * m_header->unitbytes);
ofs *= m_header->unitbytes;
if (whence == std::ios::beg)
{