Merge

1 files changed, 4 insertions, 2 deletions

diff --git a/68kinst.h b/68kinst.h
index 0dc5a3f..768793f 100644
--- a/68kinst.h
+++ b/68kinst.h
@@ -1,6 +1,6 @@
 /*
  Copyright 2013 Michael Pavone
- This file is part of BlastEm. 
+ This file is part of BlastEm.
  BlastEm is free software distributed under the terms of the GNU General Public License version 3 or greater. See COPYING for full license text.
 */
 #ifndef M68KINST_H_
@@ -230,7 +230,9 @@ typedef enum {
 } m68k_vector;
 
 uint16_t * m68k_decode(uint16_t * istream, m68kinst * dst, uint32_t address);
-uint32_t m68k_cycles(m68kinst * inst);
+uint32_t m68k_branch_target(m68kinst * inst, uint32_t *dregs, uint32_t *aregs);
+uint8_t m68k_is_branch(m68kinst * inst);
+uint8_t m68k_is_noncall_branch(m68kinst * inst);
 int m68k_disasm(m68kinst * decoded, char * dst);
 int m68k_disasm_labels(m68kinst * decoded, char * dst);