use x86_inc/x86_dec, bug fix in getNow()

svn path=/trunk/mono/; revision=1542

diff --git a/mono/jit/x86.brg b/mono/jit/x86.brg
index 8b1dfb657bec9c21a979c28c82a69af84c1eae4b..a4e99a01036db289af113c160556a18840b33080 100644 (file)
--- a/mono/jit/x86.brg
+++ b/mono/jit/x86.brg
@@ -694,7 +694,11 @@ reg: REM_UN (reg, reg) {
 reg: ADD (reg, CONST_I4) "MB_USE_OPT1(0)" {
        if (tree->reg1 != tree->left->reg1)
                x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-       x86_alu_reg_imm (s->code, X86_ADD, tree->reg1, tree->right->data.i);
+
+       if (tree->right->data.i == 1)
+               x86_inc_reg (s->code, tree->reg1);
+       else 
+               x86_alu_reg_imm (s->code, X86_ADD, tree->reg1, tree->right->data.i);
 }
 
 reg: ADD (reg, reg) {
@@ -706,7 +710,11 @@ reg: ADD (reg, reg) {
 reg: SUB (reg, CONST_I4) "MB_USE_OPT1(0)" {
        if (tree->reg1 != tree->left->reg1)
                x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-       x86_alu_reg_imm (s->code, X86_SUB, tree->reg1, tree->right->data.i);
+
+       if (tree->right->data.i == 1)
+               x86_dec_reg (s->code, tree->reg1);
+       else
+               x86_alu_reg_imm (s->code, X86_SUB, tree->reg1, tree->right->data.i);
 }
 
 reg: SUB (reg, reg) {

diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 32603fe44c0876a578118f0d4b5d15d9f1e433b0..d7e77916db0c51cf644a062efdaaa0fc920a8816 100644 (file)
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -302,10 +302,12 @@ static gint64
 ves_icall_System_DateTime_GetNow ()
 {
        struct timeval tv;
+       gint64 res;
 
        // fixme: it seems that .Net has another base time than Unix??
        if (gettimeofday (&tv, NULL) == 0) {
-               return (gint64)tv.tv_sec * 1000000000 + tv.tv_usec*10;
+               res = ((gint64)tv.tv_sec * 1000000 + tv.tv_usec)*10;
+               return res;
        }