← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to target-m68k/exec.h

  • Committer: Bazaar Package Importer
  • Author(s): Riku Voipio, Josh Triplett, Riku Voipio
  • Date: 2009-07-29 13:28:05 UTC
  • mfrom: (1.4.1 upstream)
  • mto: (12.1.1 sid) (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090729132805-cau7rfexh7dawyb8
Tags: 0.10.50+git20090729-1
[ Josh Triplett ]
* Remove myself from Uploaders.

[ Riku Voipio ]
* new upstream RC version
* nuke all linux-user patches (applied upstream)
  06_exit_segfault
  12_signal_powerpc_support
  21_net_soopts
  30_syscall_ipc
  32_syscall_sysctl
  35_syscall_sockaddr
  48_signal_terminate
  55_unmux_socketcall
* nuke all other applied-upstream patches
  01_nostrip (better version upstream)
  07_i386_exec_name (can be reintroduced in debian/rules)
  50_linuxbios_isa_bios_ram (shouldn't be needed anymore)
  51_linuxbios_piix_ram_size (applied)
  56_dhcp (crap)
  60_ppc_ld (reintroduce if needed)
  64_ppc_asm_constraints (ditto)
  66_tls_ld.patch (ditto)
  81_compile_dtb.patch (applied upstream)
  82_qemu-img_decimal (ditto)
* move to git
* simplify build rules
* Correct my email address

Show diffs side-by-side

added added

removed removed

Lines of Context:
target-m68k/exec.h
15
15
 * General Public License for more details.
16
16
 *
17
17
 * You should have received a copy of the GNU Lesser General Public
18
 
 * License along with this library; if not, write to the Free Software
19
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA  02110-1301 USA
 
18
 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
20
19
 */
21
20
#include "dyngen-exec.h"
22
21
 
37
36
{
38
37
}
39
38
 
40
 
int cpu_m68k_handle_mmu_fault (CPUState *env, target_ulong address, int rw,
41
 
                              int mmu_idx, int is_softmmu);
42
 
 
43
39
#if !defined(CONFIG_USER_ONLY)
44
40
#include "softmmu_exec.h"
45
41
#endif
46
42
 
 
43
static inline int cpu_has_work(CPUState *env)
 
44
{
 
45
    return (env->interrupt_request & (CPU_INTERRUPT_HARD));
 
46
}
 
47
 
47
48
static inline int cpu_halted(CPUState *env) {
48
49
    if (!env->halted)
49
50
        return 0;
50
 
    if (env->interrupt_request & CPU_INTERRUPT_HARD) {
 
51
    if (cpu_has_work(env)) {
51
52
        env->halted = 0;
52
53
        return 0;
53
54
    }