6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-01-14 13:33:42 +00:00
Code Issues Projects Releases Wiki Activity

With the ROM now using a read ID to set its expectations, implemented that and fixed FIND/READ_HEADER macros for multiple use. Execution now reaches the unimplemented section of read data.

Browse Source
This commit is contained in:
Thomas Harte 2017-08-06 20:32:46 -04:00
parent 3b7ecbdf0d
commit e4b405fd3d
1 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Components/8272/i8272.cpp
View File

@ -108,27 +108,30 @@ void i8272::set_disk(std::shared_ptr<Storage::Disk::Disk> disk, int drive) {
#define WAIT_FOR_EVENT(mask) resume_point_ = __LINE__; interesting_event_mask_ = (int)mask; return; case __LINE__: #define WAIT_FOR_EVENT(mask) resume_point_ = __LINE__; interesting_event_mask_ = (int)mask; return; case __LINE__:
#define PASTE(x, y) x##y
#define CONCAT(x, y) PASTE(x, y)
#define FIND_HEADER() \ #define FIND_HEADER() \
{ \ CONCAT(find_header, __LINE__): WAIT_FOR_EVENT((int)Event::Token | (int)Event::IndexHole); \
find_header: WAIT_FOR_EVENT((int)Event::Token | (int)Event::IndexHole); \ if(event_type == (int)Event::IndexHole) index_hole_limit_--; \
if(event_type == (int)Event::IndexHole) index_hole_limit_--; \ else if(get_latest_token().type == Token::ID) goto CONCAT(header_found, __LINE__); \
else if(get_latest_token().type == Token::ID) goto header_found; \ \
\ if(index_hole_limit_) goto CONCAT(find_header, __LINE__); \
if(index_hole_limit_) goto find_header; \ CONCAT(header_found, __LINE__): 0;\
header_found: 0;\
}
#define READ_HEADER() \ #define READ_HEADER() \
distance_into_header_ = 0; \ distance_into_header_ = 0; \
set_data_mode(Reading); \ set_data_mode(Reading); \
{ \ CONCAT(read_header, __LINE__): WAIT_FOR_EVENT(Event::Token); \
read_header: WAIT_FOR_EVENT(Event::Token); \ header_[distance_into_header_] = get_latest_token().byte_value; \
header_[distance_into_header_] = get_latest_token().byte_value; \ distance_into_header_++; \
distance_into_header_++; \ if(distance_into_header_ != 7) goto CONCAT(read_header, __LINE__); \
if(distance_into_header_ != 7) goto read_header; \
} \
set_data_mode(Scanning); set_data_mode(Scanning);
#define SET_DRIVE_HEAD_MFM() \
if(!dma_mode_) main_status_ |= StatusNDM; \
set_drive(drives_[command_[1]&3].drive); \
set_is_double_density(command_[0] & 0x40);
void i8272::posit_event(int event_type) { void i8272::posit_event(int event_type) {
if(!(interesting_event_mask_ & event_type)) return; if(!(interesting_event_mask_ & event_type)) return;
@ -213,9 +216,7 @@ void i8272::posit_event(int event_type) {
read_data: read_data:
printf("Read data, sector %02x %02x %02x %02x\n", command_[2], command_[3], command_[4], command_[5]); printf("Read data, sector %02x %02x %02x %02x\n", command_[2], command_[3], command_[4], command_[5]);
if(!dma_mode_) main_status_ |= StatusNDM; SET_DRIVE_HEAD_MFM();
set_drive(drives_[command_[1]&3].drive);
set_is_double_density(command_[0] & 0x40);
cylinder_ = command_[2]; cylinder_ = command_[2];
head_ = command_[3]; head_ = command_[3];
sector_ = command_[4]; sector_ = command_[4];
@ -267,8 +268,37 @@ void i8272::posit_event(int event_type) {
goto wait_for_command; goto wait_for_command;
read_id: read_id:
printf("Read ID unimplemented!!\n"); printf("Read ID\n");
goto wait_for_command; SET_DRIVE_HEAD_MFM();
index_hole_limit_ = 2;
read_id_find_next_sector:
FIND_HEADER();
if(!index_hole_limit_) goto read_id_not_found;
READ_HEADER();
cylinder_ = header_[0];
head_ = header_[1];
sector_ = header_[2];
size_ = header_[3];
goto return_st012chrn;
read_id_not_found:
status_[1] |= 0x4;
status_[0] = 0x40; // (status_[0] & ~0xc0) |
return_st012chrn:
result_stack_.push_back(size_);
result_stack_.push_back(sector_);
result_stack_.push_back(head_);
result_stack_.push_back(cylinder_);
result_stack_.push_back(status_[2]);
result_stack_.push_back(status_[1]);
result_stack_.push_back(status_[0]);
goto post_result;
format_track: format_track:
printf("Fromat track unimplemented!!\n"); printf("Fromat track unimplemented!!\n");