comparison debug.c @ 652:f822d9216968

Merge
author Michael Pavone <pavone@retrodev.com>
date Tue, 30 Dec 2014 19:11:34 -0800
parents 624dd5106060 b76d2a628ab9
children 8aa9aacefe12
comparison
equal deleted inserted replaced
620:9d6fed6501ba 652:f822d9216968
630 for (int flag = 0; flag < 5; flag++) { 630 for (int flag = 0; flag < 5; flag++) {
631 value |= context->flags[flag] << (4-flag); 631 value |= context->flags[flag] << (4-flag);
632 } 632 }
633 } else if(param[0] == 'c') { 633 } else if(param[0] == 'c') {
634 value = context->current_cycle; 634 value = context->current_cycle;
635 } else if (param[0] == '0' && param[1] == 'x') { 635 } else if ((param[0] == '0' && param[1] == 'x') || param[0] == '$') {
636 uint32_t p_addr = strtol(param+2, NULL, 16); 636 uint32_t p_addr = strtol(param+(param[0] == '0' ? 2 : 1), NULL, 16);
637 value = read_dma_value(p_addr/2); 637 if ((p_addr & 0xFFFFFF) == 0xC00004) {
638 genesis_context * gen = context->system;
639 value = vdp_hv_counter_read(gen->vdp);
640 } else {
641 value = read_dma_value(p_addr/2);
642 }
638 } else { 643 } else {
639 fprintf(stderr, "Unrecognized parameter to p: %s\n", param); 644 fprintf(stderr, "Unrecognized parameter to p: %s\n", param);
640 break; 645 break;
641 } 646 }
642 printf(format, param, value); 647 printf(format, param, value);