summaryrefslogtreecommitdiff
path: root/src/arch/arm/insts/pred_inst.cc
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
committerGabe Black <gblack@eecs.umich.edu>2010-06-02 12:58:00 -0500
commitaf91d272711632e63514d5d5866e0f60bf7974d6 (patch)
tree3d4aeaa74255395c50d1b5853d467f6cc05dfac5 /src/arch/arm/insts/pred_inst.cc
parentbfe1a194ddf371a9520023765ade1070d89232d5 (diff)
downloadgem5-af91d272711632e63514d5d5866e0f60bf7974d6.tar.xz
ARM: Add a base class for 32 bit thumb data processing immediate instructions.
Diffstat (limited to 'src/arch/arm/insts/pred_inst.cc')
-rw-r--r--src/arch/arm/insts/pred_inst.cc17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/arch/arm/insts/pred_inst.cc b/src/arch/arm/insts/pred_inst.cc
index f98db1c8e..b1b21677c 100644
--- a/src/arch/arm/insts/pred_inst.cc
+++ b/src/arch/arm/insts/pred_inst.cc
@@ -1,4 +1,17 @@
-/* Copyright (c) 2007-2008 The Florida State University
+/*
+ * Copyright (c) 2010 ARM Limited
+ * All rights reserved
+ *
+ * The license below extends only to copyright in the software and shall
+ * not be construed as granting a license to any other intellectual
+ * property including but not limited to intellectual property relating
+ * to a hardware implementation of the functionality of the software
+ * licensed hereunder. You may use the software subject to the license
+ * terms below provided that you ensure that this notice is replicated
+ * unmodified and in its entirety in all distributions of the software,
+ * modified or unmodified, in source code or in binary form.
+ *
+ * Copyright (c) 2007-2008 The Florida State University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -40,7 +53,7 @@ PredIntOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
}
std::string
-PredImmOp::generateDisassembly(Addr pc, const SymbolTable *symtab) const
+PredImmOpBase::generateDisassembly(Addr pc, const SymbolTable *symtab) const
{
std::stringstream ss;
printDataInst(ss, true);