← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/monitor/mon_breakpoint.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
http://bugs.debian.org/287640
http://bugs.debian.org/286767
http://bugs.debian.org/152952
http://bugs.debian.org/207942
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/monitor/mon_breakpoint.c
236
236
            remove_checkpoint_from_list(&(breakpoints[mem]), bp);
237
237
 
238
238
            if (!any_breakpoints(mem)) {
239
 
                mon_mask[mem] &= ~MI_BREAK;
240
 
                if (!mon_mask[mem])
 
239
                monitor_mask[mem] &= ~MI_BREAK;
 
240
                if (!monitor_mask[mem])
241
241
                    interrupt_monitor_trap_off(mon_interfaces[mem]->int_status);            }
242
242
        } else {
243
243
            if (bp->watch_load)
246
246
                remove_checkpoint_from_list(&(watchpoints_store[mem]), bp);
247
247
 
248
248
            if (!any_watchpoints(mem)) {
249
 
                mon_mask[mem] &= ~MI_WATCH;
 
249
                monitor_mask[mem] &= ~MI_WATCH;
250
250
                mon_interfaces[mem]->toggle_watchpoints_func(0,
251
251
                    mon_interfaces[mem]->context);
252
252
 
253
 
                if (!mon_mask[mem])
 
253
                if (!monitor_mask[mem])
254
254
                    interrupt_monitor_trap_off(mon_interfaces[mem]->int_status);            }
255
255
        }
256
256
    }
333
333
    return 0;
334
334
}
335
335
 
336
 
bool mon_breakpoint_check_checkpoint(MEMSPACE mem, WORD addr,
337
 
                                     break_list_t *list)
 
336
bool monitor_breakpoint_check_checkpoint(MEMSPACE mem, WORD addr,
 
337
                                         break_list_t *list)
338
338
{
339
339
    break_list_t *ptr;
340
340
    breakpoint_t *bp;
453
453
    mem = addr_memspace(start_addr);
454
454
    if (!is_load && !is_store) {
455
455
        if (!any_breakpoints(mem)) {
456
 
            mon_mask[mem] |= MI_BREAK;
 
456
            monitor_mask[mem] |= MI_BREAK;
457
457
            interrupt_monitor_trap_on(mon_interfaces[mem]->int_status);
458
458
        }
459
459
 
460
460
        add_to_checkpoint_list(&(breakpoints[mem]), new_bp);
461
461
    } else {
462
462
        if (!any_watchpoints(mem)) {
463
 
            mon_mask[mem] |= MI_WATCH;
 
463
            monitor_mask[mem] |= MI_WATCH;
464
464
            mon_interfaces[mem]->toggle_watchpoints_func(1,
465
465
                mon_interfaces[mem]->context);
466
466
            interrupt_monitor_trap_on(mon_interfaces[mem]->int_status);
490
490
                                  is_temp, TRUE );
491
491
}
492
492
 
493
 
mon_breakpoint_type_t mon_is_breakpoint(MON_ADDR address)
 
493
mon_breakpoint_type_t mon_breakpoint_is(MON_ADDR address)
494
494
{
495
495
    MEMSPACE mem = addr_memspace(address);
496
496
    WORD addr = addr_location(address);
504
504
    return (ptr->brkpt->enabled == e_ON) ? BP_ACTIVE : BP_INACTIVE;
505
505
}
506
506
 
507
 
void mon_set_breakpoint(MON_ADDR address)
 
507
void mon_breakpoint_set(MON_ADDR address)
508
508
{
509
509
    MEMSPACE mem = addr_memspace(address);
510
510
    WORD addr = addr_location(address);
522
522
    }
523
523
}
524
524
 
525
 
void mon_unset_breakpoint(MON_ADDR address)
 
525
void mon_breakpoint_unset(MON_ADDR address)
526
526
{
527
527
    MEMSPACE mem = addr_memspace(address);
528
528
    WORD addr = addr_location(address);
536
536
    }
537
537
}
538
538
 
539
 
void mon_enable_breakpoint(MON_ADDR address)
 
539
void mon_breakpoint_enable(MON_ADDR address)
540
540
{
541
541
    MEMSPACE mem = addr_memspace(address);
542
542
    WORD addr = addr_location(address);
550
550
    }
551
551
}
552
552
 
553
 
void mon_disable_breakpoint(MON_ADDR address)
 
553
void mon_breakpoint_disable(MON_ADDR address)
554
554
{
555
555
    MEMSPACE mem = addr_memspace(address);
556
556
    WORD addr = addr_location(address);