qxl: add to the list of devices which disable the default vga

[qemu.git] / target-cris / exec.h

diff --git a/target-cris/exec.h b/target-cris/exec.h
index 5f3cc0017844dad75d45a359a45c950265c8d3a2..2d5d297e1b125be486bee07406e50e05c5c510ef 100644 (file)
--- a/target-cris/exec.h
+++ b/target-cris/exec.h
@@ -15,8 +15,7 @@
  * General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "dyngen-exec.h"
 
@@ -25,35 +24,17 @@ register struct CPUCRISState *env asm(AREG0);
 #include "cpu.h"
 #include "exec-all.h"
 
-static inline void env_to_regs(void)
-{
-}
-
-static inline void regs_to_env(void)
-{
-}
-
 #if !defined(CONFIG_USER_ONLY)
 #include "softmmu_exec.h"
 #endif
 
-void cpu_cris_flush_flags(CPUCRISState *env, int cc_op);
-void helper_movec(CPUCRISState *env, int reg, uint32_t val);
-
 static inline int cpu_has_work(CPUState *env)
 {
     return (env->interrupt_request & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI));
 }
 
-static inline int cpu_halted(CPUState *env) {
-       if (!env->halted)
-               return 0;
-
-       /* IRQ, NMI and GURU execeptions wakes us up.  */
-       if (env->interrupt_request
-           & (CPU_INTERRUPT_HARD | CPU_INTERRUPT_NMI)) {
-               env->halted = 0;
-               return 0;
-       }
-       return EXCP_HALTED;
+static inline void cpu_pc_from_tb(CPUState *env, TranslationBlock *tb)
+{
+    env->pc = tb->pc;
 }
+