Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Moar data for disk write tracing

Browse Source
This commit is contained in:
Aaron Culliney 2015-10-18 12:25:04 -07:00
parent 41ae0266e2
commit b496d771f6
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/disk.c
View File

@ -130,6 +130,14 @@ static inline bool is_po(const char * const name) {
#define NUM_SIXBIT_NIBS (0x100 + SIXBIT_EXTRA_BYTES) // 256 + 86 == 342
#if DISK_TRACING
#define _DISK_TRACE_RAWSRC() \
if (test_write_fp) { \
fprintf(test_write_fp, "RAWBUF:\n"); \
for (unsigned int i=0; i<NUM_SIXBIT_NIBS+1; i++) { \
fprintf(test_write_fp, "%02X", src[i]); \
} \
fprintf(test_write_fp, "\n"); \
}
#define _DISK_TRACE_SIXBITNIBS() \
if (test_write_fp) { \
fprintf(test_write_fp, "SIXBITNIBS:\n"); \
@ -155,6 +163,7 @@ static inline bool is_po(const char * const name) {
fprintf(test_write_fp, "%s", "\n"); \
}
#else
#define _DISK_TRACE_RAWSRC()
#define _DISK_TRACE_SIXBITNIBS()
#define _DISK_TRACE_XORNIBS()
#define _DISK_TRACE_SECDATA()
@ -202,6 +211,7 @@ static void nibblize_sector(const uint8_t * const src, uint8_t * const out) {
static void denibblize_sector(const uint8_t * const src, uint8_t * const out) {
SCOPE_TRACE_DISK("denibblize_sector");
_DISK_TRACE_RAWSRC();
uint8_t work_buf[NUM_SIXBIT_NIBS+1];
// Convert disk bytes into 6-bit bytes

17
src/test/testdisk.c
View File

@ -323,11 +323,11 @@ TEST test_savehello_po() {
}
#if CONFORMANT_TRACKS
# define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 63675
# define EXPECTED_DISKWRITE_TRACE_DSK_SHA "CFA1C3AB2CA4F245D291DFC8C277773C5275946C"
# define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 85915
# define EXPECTED_DISKWRITE_TRACE_DSK_SHA "727162AD8C2C475BDFE1DEEDAE068215C50A28D1"
#else
# define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 63676 // orly?
# define EXPECTED_DISKWRITE_TRACE_DSK_SHA "FA3792F09A5E96B906D3F2362C6701C0DFB2130C"
# define EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE 85916
# define EXPECTED_DISKWRITE_TRACE_DSK_SHA "A8956DFE0E6CDFB5A2A838971FB9CAB9DC0913BB"
#endif
#define EXPECTED_BSAVE_DSK_SHA "4DC3AEB266692EB5F8C757F36963F8CCC8056AE4"
TEST test_disk_bytes_savehello_dsk() {
@ -515,13 +515,8 @@ TEST test_disk_bytes_savehello_nib() {
PASS();
}
#if CONFORMANT_TRACKS
# define EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE 63675
# define EXPECTED_DISKWRITE_TRACE_PO_SHA "CFA1C3AB2CA4F245D291DFC8C277773C5275946C"
#else
# define EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE 63676 // orly?
# define EXPECTED_DISKWRITE_TRACE_PO_SHA "FA3792F09A5E96B906D3F2362C6701C0DFB2130C"
#endif
#define EXPECTED_DISKWRITE_TRACE_PO_FILE_SIZE EXPECTED_DISKWRITE_TRACE_DSK_FILE_SIZE
#define EXPECTED_DISKWRITE_TRACE_PO_SHA EXPECTED_DISKWRITE_TRACE_DSK_SHA
#define EXPECTED_BSAVE_PO_SHA "9B47A4B92F64ACEB2B82B3B870C78E93780F18F3"
TEST test_disk_bytes_savehello_po() {
test_setup_boot_disk(BLANK_PO, 0);