about summary refs log tree commit diff stats
path: root/subx/015immediate_addressing.cc
diff options
context:
space:
mode:
Diffstat (limited to 'subx/015immediate_addressing.cc')
-rw-r--r--subx/015immediate_addressing.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/subx/015immediate_addressing.cc b/subx/015immediate_addressing.cc
index 7abf7951..30f96523 100644
--- a/subx/015immediate_addressing.cc
+++ b/subx/015immediate_addressing.cc
@@ -124,18 +124,19 @@ void test_subtract_imm32_from_eax() {
 case 0x2d: {  // subtract imm32 from EAX
   const int32_t signed_arg2 = next32();
   trace(Callstack_depth+1, "run") << "subtract imm32 0x" << HEXWORD << signed_arg2 << " from EAX" << end();
-  int64_t signed_full_result = Reg[EAX].i - signed_arg2;
-  Reg[EAX].i -= signed_arg2;
-  trace(Callstack_depth+1, "run") << "storing 0x" << HEXWORD << Reg[EAX].i << end();
-  SF = (Reg[EAX].i < 0);
-  ZF = (Reg[EAX].i == 0);
-  OF = (Reg[EAX].i != signed_full_result);
+  int32_t signed_result = Reg[EAX].i - signed_arg2;
+  SF = (signed_result < 0);
+  ZF = (signed_result == 0);
+  int64_t signed_full_result = static_cast<int64_t>(Reg[EAX].i) - signed_arg2;
+  OF = (signed_result != signed_full_result);
   // set CF
   uint32_t unsigned_arg2 = static_cast<uint32_t>(signed_arg2);
   uint32_t unsigned_result = Reg[EAX].u - unsigned_arg2;
-  uint64_t unsigned_full_result = Reg[EAX].u - unsigned_arg2;
+  uint64_t unsigned_full_result = static_cast<uint64_t>(Reg[EAX].u) - unsigned_arg2;
   CF = (unsigned_result != unsigned_full_result);
   trace(Callstack_depth+1, "run") << "SF=" << SF << "; ZF=" << ZF << "; CF=" << CF << "; OF=" << OF << end();
+  Reg[EAX].i = signed_result;
+  trace(Callstack_depth+1, "run") << "storing 0x" << HEXWORD << Reg[EAX].i << end();
   break;
 }
 
ommitter Kartik K. Agaram <vc@akkartik.com> 2015-10-01 16:33:34 -0700 2231' href='/akkartik/mu/commit/021check_instruction.cc?h=main&id=16386f766ec1e347db8a19ebfd9cedaa9b281a5f'>16386f76 ^
a0fc38c9 ^
e236973b ^
a0fc38c9 ^

5f98a10c ^
a0fc38c9 ^



5f98a10c ^
a0fc38c9 ^




e236973b ^
a0fc38c9 ^
e236973b ^

a0fc38c9 ^






5f98a10c ^
a0fc38c9 ^


5f98a10c ^
a0fc38c9 ^

5f98a10c ^
a0fc38c9 ^


5f98a10c ^
a0fc38c9 ^

5f98a10c ^
a0fc38c9 ^


5f98a10c ^
a0fc38c9 ^

5f98a10c ^
a0fc38c9 ^


5f98a10c ^
a0fc38c9 ^










c6034af3 ^







70f70118 ^
1fa53058 ^



c6034af3 ^

a0fc38c9 ^

1fa53058 ^


37b8273e ^
1fa53058 ^







a0fc38c9 ^
c3deac87 ^
a0fc38c9 ^


c6034af3 ^
a0fc38c9 ^
c6034af3 ^
a0fc38c9 ^


c6034af3 ^
a0fc38c9 ^
c6034af3 ^
a0fc38c9 ^
a0d7a155 ^

c6034af3 ^
a0d7a155 ^
ae256ea1 ^

c6034af3 ^

4e49b29e ^


c6034af3 ^
4e49b29e ^
ae256ea1 ^
4e49b29e ^

a0d7a155 ^
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144


                                                                              





                                                                            
 
                                                             
                                       

       
                                                
                                                                                          


                                                             
                                
                             
                                

                                                            
                                                                                                            



                                                                          
                                                                                                                                                                                                 




                                             
                                    
                

                                    






                                     
                     


                         
                                                                          

                                            
                     


                           
                                                                

                                              
                     


                                         
                                                                

                                              
                     


                             
                                                                  










                                                                                                       







                                                             
                                



                                                            

                                                                                  

 


                                                                                       
                        







                                                                                            
                               
                                


                             
                            
                                  
                                                


                               
                            
                                  
                                                  
 

                              
                            
                    

                                                               

                                                                                                           


                              
                            
                    
                                                                                              

                                   
 
//: Introduce a new transform to perform various checks in instructions before
//: we start running them. It'll be extensible, so that we can add checks for
//: new recipes as we extend 'run' to support them.
//:
//: Doing checking in a separate part complicates things, because the values
//: of variables in memory and the processor (current_recipe_name,
//: current_instruction) aren't available at checking time. If I had a more
//: sophisticated layer system I'd introduce the simpler version first and
//: transform it in a separate layer or set of layers.

:(after "Transform.push_back(update_instruction_operations)")
Transform.push_back(check_instruction);

:(code)
void check_instruction(const recipe_ordinal r) {
  trace(9991, "transform") << "--- perform checks for recipe " << Recipe[r].name << end();
  map<string, vector<type_ordinal> > metadata;
  for (long long int i = 0; i < SIZE(Recipe[r].steps); ++i) {
    instruction& inst = Recipe[r].steps.at(i);
    if (inst.is_label) continue;
    switch (inst.operation) {
      // Primitive Recipe Checks
      case COPY: {
        if (SIZE(inst.products) != SIZE(inst.ingredients)) {
          raise_error << "ingredients and products should match in '" << inst.to_string() << "'\n" << end();
          break;
        }
        for (long long int i = 0; i < SIZE(inst.ingredients); ++i) {
          if (!types_match(inst.products.at(i), inst.ingredients.at(i))) {
            raise_error << maybe(Recipe[r].name) << "can't copy " << inst.ingredients.at(i).original_string << " to " << inst.products.at(i).original_string << "; types don't match\n" << end();
            goto finish_checking_instruction;
          }
        }
        break;
      }
      // End Primitive Recipe Checks
      default: {
        // Defined Recipe Checks
        // End Defined Recipe Checks
      }
    }
    finish_checking_instruction:;
  }
}

:(scenario copy_checks_reagent_count)
% Hide_errors = true;
recipe main [
  1:number <- copy 34, 35
]
+error: ingredients and products should match in '1:number <- copy 34, 35'

:(scenario write_scalar_to_array_disallowed)
% Hide_errors = true;
recipe main [
  1:array:number <- copy 34
]
+error: main: can't copy 34 to 1:array:number; types don't match

:(scenario write_scalar_to_array_disallowed_2)
% Hide_errors = true;
recipe main [
  1:number, 2:array:number <- copy 34, 35
]
+error: main: can't copy 35 to 2:array:number; types don't match

:(scenario write_scalar_to_address_disallowed)
% Hide_errors = true;
recipe main [
  1:address:number <- copy 34
]
+error: main: can't copy 34 to 1:address:number; types don't match

:(code)
bool types_match(reagent lhs, reagent rhs) {
  // '_' never raises type error
  if (is_dummy(lhs)) return true;
  // to sidestep type-checking, use /raw in the source.
  // this is unsafe, and will be highlighted in red inside vim. just for some tests.
  if (is_raw(rhs)) return true;
  // allow writing 0 to any address
  if (rhs.name == "0" && is_mu_address(lhs)) return true;
  if (is_literal(rhs)) return !is_mu_array(lhs) && !is_mu_address(lhs) && size_of(rhs) == size_of(lhs);
  if (!lhs.type) return !rhs.type;
  return types_match(lhs.type, rhs.type);
}

// two types match if the second begins like the first
// (trees perform the same check recursively on each subtree)
bool types_match(type_tree* lhs, type_tree* rhs) {
  if (!lhs) return true;
  if (!rhs || rhs->value == 0) {
    if (lhs->value == Type_ordinal["array"]) return false;
    if (lhs->value == Type_ordinal["address"]) return false;
    return size_of(rhs) == size_of(lhs);
  }
  if (lhs->value != rhs->value) return false;
  return types_match(lhs->left, rhs->left) && types_match(lhs->right, rhs->right);
}

// hacky version that allows 0 addresses
bool types_match(const reagent lhs, const type_tree* rhs, const vector<double>& data) {
  if (is_dummy(lhs)) return true;
  if (rhs->value == 0) {
    if (lhs.type->value == Type_ordinal["array"]) return false;
    if (lhs.type->value == Type_ordinal["address"]) return scalar(data) && data.at(0) == 0;
    return size_of(rhs) == size_of(lhs);
  }
  if (lhs.type->value != rhs->value) return false;
  return types_match(lhs.type->left, rhs->left) && types_match(lhs.type->right, rhs->right);
}

bool is_raw(const reagent& r) {
  return has_property(r, "raw");
}

bool is_mu_array(reagent r) {
  if (!r.type) return false;
  if (is_literal(r)) return false;
  return r.type->value == Type_ordinal["array"];
}

bool is_mu_address(reagent r) {
  if (!r.type) return false;
  if (is_literal(r)) return false;
  return r.type->value == Type_ordinal["address"];
}

bool is_mu_number(reagent r) {
  if (!r.type) return false;
  if (is_literal(r))
    return r.properties.at(0).second->value == "literal-number"
        || r.properties.at(0).second->value == "literal";
  if (r.type->value == Type_ordinal["character"]) return true;  // permit arithmetic on unicode code points
  return r.type->value == Type_ordinal["number"];
}

bool is_mu_scalar(reagent r) {
  if (!r.type) return false;
  if (is_literal(r))
    return !r.properties.at(0).second || r.properties.at(0).second->value != "literal-string";
  if (is_mu_array(r)) return false;
  return size_of(r) == 1;
}