X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm_disassembler.h;h=4aee3519dc5d31ceca269783d43b0245870923b1;hb=73b676c2fdedcb913f1c20be7de99ea0a94b11cc;hp=bdfdb038cd78d6316e9deca38760e6434fa01955;hpb=374127301ec1d72033b9d573b72c7abdfd61990d;p=openocd.git

diff --git a/src/target/arm_disassembler.h b/src/target/arm_disassembler.h
index bdfdb038cd..4aee3519dc 100644
--- a/src/target/arm_disassembler.h
+++ b/src/target/arm_disassembler.h
@@ -15,14 +15,12 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
 #ifndef ARM_DISASSEMBLER_H
 #define ARM_DISASSEMBLER_H
 
-#include <helper/types.h>
-
 enum arm_instruction_type {
 	ARM_UNKNOWN_INSTUCTION,
 
@@ -86,9 +84,14 @@ enum arm_instruction_type {
 	/* Miscellaneous instructions */
 	ARM_CLZ,
 
+	/* Exception return instructions */
+	ARM_ERET,
+
 	/* Exception generating instructions */
 	ARM_BKPT,
 	ARM_SWI,
+	ARM_HVC,
+	ARM_SMC,
 
 	/* Coprocessor instructions */
 	ARM_CDP,