Commit bdb4b689 authored by Aurelien Jarno's avatar Aurelien Jarno
Browse files

target-ppc: convert lscbx instruction to TCG 



Signed-off-by: default avatarAurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5829 c046a42c-6fe2-441c-8c8c-71466251a162
parent dfbc799d

target-ppc/helper.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ DEF_HELPER_3(stsw, void, tl, i32, i32) 
DEF_HELPER_1(dcbz, void, tl)

DEF_HELPER_1(dcbz_970, void, tl)

DEF_HELPER_1(icbi, void, tl)

DEF_HELPER_4(lscbx, tl, tl, i32, i32, i32)





DEF_HELPER_2(fcmpo, i32, i64, i64)

DEF_HELPER_2(fcmpu, i32, i64, i64)

target-ppc/op_helper.c

+39 −15
Original line number Diff line number Diff line
@@ -24,21 +24,6 @@ 
#include "helper_regs.h"

#include "op_helper.h"



#define MEMSUFFIX _raw

#include "op_helper.h"

#include "op_helper_mem.h"

#if !defined(CONFIG_USER_ONLY)

#define MEMSUFFIX _user

#include "op_helper.h"

#include "op_helper_mem.h"

#define MEMSUFFIX _kernel

#include "op_helper.h"

#include "op_helper_mem.h"

#define MEMSUFFIX _hypv

#include "op_helper.h"

#include "op_helper_mem.h"

#endif



//#define DEBUG_OP

//#define DEBUG_EXCEPTIONS

//#define DEBUG_SOFTWARE_TLB
@@ -329,6 +314,45 @@ void helper_icbi(target_ulong addr) 
    tb_invalidate_page_range(addr, addr + env->icache_line_size);

}



// XXX: to be tested

target_ulong helper_lscbx (target_ulong addr, uint32_t reg, uint32_t ra, uint32_t rb)

{

    int i, c, d;

#ifdef CONFIG_USER_ONLY

#define ldfun ldub_raw

#else

    int (*ldfun)(target_ulong);



    switch (env->mmu_idx) {

    default:

    case 0: ldfun = ldub_user;

        break;

    case 1: ldfun = ldub_kernel;

        break;

    case 2: ldfun = ldub_hypv;

        break;

    }

#endif

    d = 24;

    for (i = 0; i < xer_bc; i++) {

        c = ldfun((uint32_t)addr++);

        /* ra (if not 0) and rb are never modified */

        if (likely(reg != rb && (ra == 0 || reg != ra))) {

            env->gpr[reg] = (env->gpr[reg] & ~(0xFF << d)) | (c << d);

        }

        if (unlikely(c == xer_cmp))

            break;

        if (likely(d != 0)) {

            d -= 8;

        } else {

            d = 24;

            reg++;

            reg = reg & 0x1F;

        }

    }

    return i;

}



/*****************************************************************************/

/* Fixed point operations helpers */

#if defined(TARGET_PPC64)

target-ppc/op_helper.h

+0 −13
Original line number Diff line number Diff line
@@ -18,17 +18,6 @@ 
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#if defined(MEMSUFFIX)



/* Memory load/store helpers */

void glue(do_POWER_lscbx, MEMSUFFIX) (int dest, int ra, int rb);

void glue(do_POWER2_lfq, MEMSUFFIX) (void);

void glue(do_POWER2_lfq_le, MEMSUFFIX) (void);

void glue(do_POWER2_stfq, MEMSUFFIX) (void);

void glue(do_POWER2_stfq_le, MEMSUFFIX) (void);



#else



void do_print_mem_EA (target_ulong EA);



/* Registers load and stores */
@@ -94,5 +83,3 @@ void do_440_dlmzb (void); 
void do_load_403_pb (int num);

void do_store_403_pb (int num);

#endif
 


#endif

target-ppc/op_helper_mem.h

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
/*

 *  PowerPC emulation micro-operations helpers for qemu.

 *

 *  Copyright (c) 2003-2007 Jocelyn Mayer

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */



#include "op_mem_access.h"



/* PowerPC 601 specific instructions (POWER bridge) */

// XXX: to be tested

void glue(do_POWER_lscbx, MEMSUFFIX) (int dest, int ra, int rb)

{

    int i, c, d, reg;



    d = 24;

    reg = dest;

    for (i = 0; i < T1; i++) {

        c = glue(ldu8, MEMSUFFIX)((uint32_t)T0++);

        /* ra (if not 0) and rb are never modified */

        if (likely(reg != rb && (ra == 0 || reg != ra))) {

            env->gpr[reg] = (env->gpr[reg] & ~(0xFF << d)) | (c << d);

        }

        if (unlikely(c == T2))

            break;

        if (likely(d != 0)) {

            d -= 8;

        } else {

            d = 24;

            reg++;

            reg = reg & 0x1F;

        }

    }

    T0 = i;

}



#undef MEMSUFFIX

target-ppc/op_mem.h

+0 −11
Original line number Diff line number Diff line
@@ -303,15 +303,4 @@ void OPPROTO glue(op_ecowx_le_64, MEMSUFFIX) (void) 
}

#endif



/* XXX: those micro-ops need tests ! */

/* PowerPC 601 specific instructions (POWER bridge) */

void OPPROTO glue(op_POWER_lscbx, MEMSUFFIX) (void)

{

    /* When byte count is 0, do nothing */

    if (likely(T1 != 0)) {

        glue(do_POWER_lscbx, MEMSUFFIX)(PARAM1, PARAM2, PARAM3);

    }

    RETURN();

}



#undef MEMSUFFIX