kvm: save/restore x86-64 MSRs on x86-64 kernels

[qemu.git] / target-i386 / helper_template.h

diff --git a/target-i386/helper_template.h b/target-i386/helper_template.h
index 95af5238c34b302158670dcb4329f9f209012749..afc41fb980825e2190c2c9dfb9070c092698110e 100644 (file)
--- a/target-i386/helper_template.h
+++ b/target-i386/helper_template.h
@@ -14,8 +14,7 @@
  * 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
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #define DATA_BITS (1 << (3 + SHIFT))
 #define SHIFT_MASK (DATA_BITS - 1)
@@ -280,18 +279,18 @@ target_ulong glue(helper_rcl, SUFFIX)(target_ulong t0, target_ulong t1)
     count = rclb_table[count];
 #endif
     if (count) {
-        eflags = cc_table[CC_OP].compute_all();
+        eflags = helper_cc_compute_all(CC_OP);
         t0 &= DATA_MASK;
         src = t0;
         res = (t0 << count) | ((target_ulong)(eflags & CC_C) << (count - 1));
         if (count > 1)
             res |= t0 >> (DATA_BITS + 1 - count);
         t0 = res;
-        env->t3 = (eflags & ~(CC_C | CC_O)) |
+        env->cc_tmp = (eflags & ~(CC_C | CC_O)) |
             (lshift(src ^ t0, 11 - (DATA_BITS - 1)) & CC_O) |
             ((src >> (DATA_BITS - count)) & CC_C);
     } else {
-        env->t3 = -1;
+        env->cc_tmp = -1;
     }
     return t0;
 }
@@ -309,18 +308,18 @@ target_ulong glue(helper_rcr, SUFFIX)(target_ulong t0, target_ulong t1)
     count = rclb_table[count];
 #endif
     if (count) {
-        eflags = cc_table[CC_OP].compute_all();
+        eflags = helper_cc_compute_all(CC_OP);
         t0 &= DATA_MASK;
         src = t0;
         res = (t0 >> count) | ((target_ulong)(eflags & CC_C) << (DATA_BITS - count));
         if (count > 1)
             res |= t0 << (DATA_BITS + 1 - count);
         t0 = res;
-        env->t3 = (eflags & ~(CC_C | CC_O)) |
+        env->cc_tmp = (eflags & ~(CC_C | CC_O)) |
             (lshift(src ^ t0, 11 - (DATA_BITS - 1)) & CC_O) |
             ((src >> (count - 1)) & CC_C);
     } else {
-        env->t3 = -1;
+        env->cc_tmp = -1;
     }
     return t0;
 }