1.1 --- a/src/aica/armdasm.c	Mon Dec 12 10:37:41 2005 +0000
     1.2 +++ b/src/aica/armdasm.c	Mon Dec 26 06:38:51 2005 +0000
     1.3 @@ -1,8 +1,19 @@
     1.4 -/*
     1.5 +/**
     1.6 + * $Id: armdasm.c,v 1.6 2005-12-25 05:57:00 nkeynes Exp $
     1.7 + * 
     1.8   * armdasm.c    21 Aug 2004  - ARM7tdmi (ARMv4) disassembler
     1.9   *
    1.10 - * Copyright (c) 2004 Nathan Keynes. Distribution and modification permitted
    1.11 - * under the terms of the GNU General Public License version 2 or later.
    1.12 + * Copyright (c) 2005 Nathan Keynes.
    1.13 + *
    1.14 + * This program is free software; you can redistribute it and/or modify
    1.15 + * it under the terms of the GNU General Public License as published by
    1.16 + * the Free Software Foundation; either version 2 of the License, or
    1.17 + * (at your option) any later version.
    1.18 + *
    1.19 + * This program is distributed in the hope that it will be useful,
    1.20 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    1.21 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    1.22 + * GNU General Public License for more details.
    1.23   */
    1.24  
    1.25  #include "aica/armcore.h"
    1.26 @@ -50,15 +61,13 @@
    1.27  
    1.28  
    1.29  const struct cpu_desc_struct arm_cpu_desc = 
    1.30 -    { "ARM7", arm_disasm_instruction, 4,
    1.31 +    { "ARM7", arm_disasm_instruction, arm_execute_instruction, arm_has_page, 4,
    1.32        (char *)&armr, sizeof(armr), arm_reg_map,
    1.33 -      &armr.r[15], &armr.icount,
    1.34 -      arm_has_page };
    1.35 +      &armr.r[15], &armr.icount };
    1.36  const struct cpu_desc_struct armt_cpu_desc = 
    1.37 -    { "ARM7T", armt_disasm_instruction, 2,
    1.38 +    { "ARM7T", armt_disasm_instruction, arm_execute_instruction, arm_has_page, 2,
    1.39        (char*)&armr, sizeof(armr), arm_reg_map,
    1.40 -      &armr.r[15], &armr.icount,
    1.41 -      arm_has_page };
    1.42 +      &armr.r[15], &armr.icount };
    1.43  
    1.44  
    1.45