add three more atom model numbers and ivybridge

This commit is contained in:
jasonmoxham 2012-03-31 19:21:37 +00:00
parent 6d1a7e93af
commit 98529cded9
3 changed files with 15 additions and 12 deletions

11
cpuid.c
View File

@ -149,17 +149,20 @@ CPUVEC_SETUP_x86_64;
if (model == 22){ CPUIS(core2);break;} if (model == 22){ CPUIS(core2);break;}
if (model == 23){ CPUIS(penryn);break;} if (model == 23){ CPUIS(penryn);break;}
if (model == 26){ CPUIS(nehalem);break;} if (model == 26){ CPUIS(nehalem);break;}
if (model == 28){ CPUIS(atom);break;} if (model == 28){ CPUIS(atom);break;}// 45nm
if (model == 29){ CPUIS(penryn);break;} if (model == 29){ CPUIS(penryn);break;}
if (model == 30){ CPUIS(nehalem);break;} if (model == 30){ CPUIS(nehalem);break;}
if (model == 31){ CPUIS(nehalem);break;} if (model == 31){ CPUIS(nehalem);break;}
if (model == 37){ CPUIS(westmere);break;} if (model == 37){ CPUIS(westmere);break;}
if (model == 38){ CPUIS(atom);break;}// atom z670 tunnel creek
if (model == 39){ CPUIS(atom);break;}// Intel Atom Z2460 (Medfield platform, Penwell SoC, Saltwell core)
if (model == 42){ CPUIS(sandybridge);break;} if (model == 42){ CPUIS(sandybridge);break;}
if (model == 44){ CPUIS(westmere);break;} if (model == 44){ CPUIS(westmere);break;}
if (model == 45){ CPUIS(sandybridge);break;} if (model == 45){ CPUIS(sandybridge);break;}
if (model == 46){ CPUIS(nehalem);break;} if (model == 46){ CPUIS(nehalem);break;}
if (model == 47){ CPUIS(westmere);break;} if (model == 47){ CPUIS(westmere);break;}
//if (model == 58){ CPUIS(ivybridge);break;} if (model == 54){ CPUIS(atom);break;}//DualCore Intel Atom D2700, 2133 MHz (16 x 133) (Cedarview, Saltwell core) 32nm
if (model == 58){ CPUIS(sandybridge);break;}// this is ivybridge , map to sandybridge for now
break; break;
case 15: case 15:
#if CONFIG_GUESS_64BIT || FAT64 #if CONFIG_GUESS_64BIT || FAT64
@ -203,10 +206,10 @@ CPUVEC_SETUP_x86_64;
if (model == 10) { CPUIS(k102);break;} if (model == 10) { CPUIS(k102);break;}
break; break;
case 17: case 17:
CPUIS(k8);// fusion of K8 and GPU CPUIS(k8);// fusion of K8 and GPU , not so , just a low power k8
break; break;
case 18: case 18:
CPUIS(k103);// like k102 but with hardware divider , is this lano? CPUIS(k103);// like k102 but with hardware divider , this is lano
break; break;
case 20: case 20:
CPUIS(bobcat);// fusion of bobcat and GPU CPUIS(bobcat);// fusion of bobcat and GPU

View File

@ -1,4 +1,4 @@
@set UPDATED 4 January 2012 @set UPDATED 18 March 2012
@set UPDATED-MONTH January 2012 @set UPDATED-MONTH March 2012
@set EDITION 2.5.1 @set EDITION 2.5.1
@set VERSION 2.5.1 @set VERSION 2.5.1

12
yasm/aclocal.m4 vendored
View File

@ -19,8 +19,8 @@ You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
# intlmacosx.m4 serial 3 (gettext-0.18) # intlmacosx.m4 serial 1 (gettext-0.17)
dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. dnl Copyright (C) 2004-2007 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved. dnl with or without modifications, as long as this notice is preserved.
@ -40,7 +40,7 @@ AC_DEFUN([gt_INTL_MACOSX],
[ [
dnl Check for API introduced in MacOS X 10.2. dnl Check for API introduced in MacOS X 10.2.
AC_CACHE_CHECK([for CFPreferencesCopyAppValue], AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
[gt_cv_func_CFPreferencesCopyAppValue], gt_cv_func_CFPreferencesCopyAppValue,
[gt_save_LIBS="$LIBS" [gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
@ -49,11 +49,11 @@ AC_DEFUN([gt_INTL_MACOSX],
[gt_cv_func_CFPreferencesCopyAppValue=no]) [gt_cv_func_CFPreferencesCopyAppValue=no])
LIBS="$gt_save_LIBS"]) LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
[Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
fi fi
dnl Check for API introduced in MacOS X 10.3. dnl Check for API introduced in MacOS X 10.3.
AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
[gt_save_LIBS="$LIBS" [gt_save_LIBS="$LIBS"
LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
@ -61,7 +61,7 @@ AC_DEFUN([gt_INTL_MACOSX],
[gt_cv_func_CFLocaleCopyCurrent=no]) [gt_cv_func_CFLocaleCopyCurrent=no])
LIBS="$gt_save_LIBS"]) LIBS="$gt_save_LIBS"])
if test $gt_cv_func_CFLocaleCopyCurrent = yes; then if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
[Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
fi fi
INTL_MACOSX_LIBS= INTL_MACOSX_LIBS=