From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 14 Sep 2009 14:32:27 -0700 Subject: Merge upstream QEMU 10.0.50 into the Android source tree. This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines. --- hostregs_helper.h | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) (limited to 'hostregs_helper.h') diff --git a/hostregs_helper.h b/hostregs_helper.h index 4fdf8ad..c206baf 100644 --- a/hostregs_helper.h +++ b/hostregs_helper.h @@ -15,12 +15,12 @@ * * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA */ -/* The GCC global register vairable extension is used to reserve some - host registers for use by dyngen. However only the core parts of the - translation engine are compiled with these settings. We must manually +/* The GCC global register variable extension is used to reserve some + host registers for use by generated code. However only the core parts of + the translation engine are compiled with these settings. We must manually save/restore these registers when called from regular code. It is not sufficient to save/restore T0 et. al. as these may be declared with a datatype smaller than the actual register. */ @@ -57,42 +57,6 @@ DO_REG(1) DO_REG(2) #endif -#ifdef AREG3 -DO_REG(3) -#endif - -#ifdef AREG4 -DO_REG(4) -#endif - -#ifdef AREG5 -DO_REG(5) -#endif - -#ifdef AREG6 -DO_REG(6) -#endif - -#ifdef AREG7 -DO_REG(7) -#endif - -#ifdef AREG8 -DO_REG(8) -#endif - -#ifdef AREG9 -DO_REG(9) -#endif - -#ifdef AREG10 -DO_REG(10) -#endif - -#ifdef AREG11 -DO_REG(11) -#endif - #undef SAVE_HOST_REGS #undef DECLARE_HOST_REGS #undef DO_REG -- cgit v1.1