[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bochs-cvs
Subject:    [Bochs-cvs] SF.net SVN: bochs:[10497] trunk/bochs/cpu/init.cc
From:       sshwarts () users ! sourceforge ! net
Date:       2011-07-27 14:16:52
Message-ID: E1Qm4up-0004sL-WB () sfp-svn-4 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Revision: 10497
          http://bochs.svn.sourceforge.net/bochs/?rev=10497&view=rev
Author:   sshwarts
Date:     2011-07-27 14:16:51 +0000 (Wed, 27 Jul 2011)

Log Message:
-----------
trim cpuid info from save/restore tree

Modified Paths:
--------------
    trunk/bochs/cpu/init.cc

Modified: trunk/bochs/cpu/init.cc
===================================================================
--- trunk/bochs/cpu/init.cc	2011-07-26 22:16:24 UTC (rev 10496)
+++ trunk/bochs/cpu/init.cc	2011-07-27 14:16:51 UTC (rev 10497)
@@ -309,12 +309,10 @@
 
   sprintf(name, "cpu%d", BX_CPU_ID);
 
-  bx_list_c *cpu = new bx_list_c(SIM->get_bochs_root(), name, name, 60 + \
BX_GENERAL_REGISTERS); +  bx_list_c *cpu = new bx_list_c(SIM->get_bochs_root(), name, \
name, 50 + BX_GENERAL_REGISTERS);  
-  BXRS_PARAM_SPECIAL32(cpu, cpu_version, param_save_handler, param_restore_handler);
-  BXRS_PARAM_SPECIAL32(cpu, cpuid_std,   param_save_handler, param_restore_handler);
-  BXRS_PARAM_SPECIAL32(cpu, cpuid_ext,   param_save_handler, param_restore_handler);
   BXRS_HEX_PARAM_SIMPLE(cpu, isa_extensions_bitmask);
+  BXRS_HEX_PARAM_SIMPLE(cpu, cpu_extensions_bitmask);
   BXRS_DEC_PARAM_SIMPLE(cpu, cpu_mode);
   BXRS_HEX_PARAM_SIMPLE(cpu, activity_state);
   BXRS_HEX_PARAM_SIMPLE(cpu, inhibit_mask);
@@ -590,13 +588,7 @@
   Bit64s val = 0;
 
   pname = param->get_name();
-  if (!strcmp(pname, "cpu_version")) {
-    val = get_cpu_version_information();
-  } else if (!strcmp(pname, "cpuid_std")) {
-    val = get_std_cpuid_features();
-  } else if (!strcmp(pname, "cpuid_ext")) {
-    val = get_extended_cpuid_features();
-  } else if (!strcmp(pname, "EFLAGS")) {
+  if (!strcmp(pname, "EFLAGS")) {
     val = BX_CPU_THIS_PTR read_eflags();
   } else if (!strcmp(pname, "selector")) {
     segname = param->get_parent()->get_name();
@@ -643,19 +635,7 @@
   bx_segment_reg_t *segment = NULL;
 
   pname = param->get_name();
-  if (!strcmp(pname, "cpu_version")) {
-    if (val != get_cpu_version_information()) {
-      BX_PANIC(("save/restore: CPU version mismatch"));
-    }
-  } else if (!strcmp(pname, "cpuid_std")) {
-    if (val != get_std_cpuid_features()) {
-      BX_PANIC(("save/restore: CPUID mismatch"));
-    }
-  } else if (!strcmp(pname, "cpuid_ext")) {
-    if (val != get_extended_cpuid_features()) {
-      BX_PANIC(("save/restore: CPUID mismatch"));
-    }
-  } else if (!strcmp(pname, "EFLAGS")) {
+  if (!strcmp(pname, "EFLAGS")) {
     BX_CPU_THIS_PTR setEFlags((Bit32u)val);
   } else if (!strcmp(pname, "selector")) {
     segname = param->get_parent()->get_name();


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

------------------------------------------------------------------------------
Got Input?   Slashdot Needs You.
Take our quick survey online.  Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs


[prev in list] [next in list] [prev in thread] [next in thread]