kompiler 0.2.0.pre.1 → 0.2.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36f0387094d41fc93e8f85e56446392a1941cbcd115bf94c3ffd799c3d85cc78
-  data.tar.gz: 63a7973c95797b77119b47f24b8aa5bda591d7d2a4e5cbd5e34485fb11aea9b7
+  metadata.gz: 69b1e8272e45a6c9ce0b8bb60dbfb89b0d65d0f8f615cbd744726857ecf1d94f
+  data.tar.gz: eba0c518a787b345d191a2cf41e76ecb52ca25dac10f14f17b72d5cbbcb2f201
 SHA512:
-  metadata.gz: 761aed3357cef9084d7dc0e7d8f9a73bb6dc883c7b1fc2cb5b0ee8b6499aa3f1f972bcc48d8d8adb2a3bd7f793738b28c1a37a21c17152d958cb79e39c7f8dab
-  data.tar.gz: dae7000f44475fdcb2c6c8e78c82f638ca09790c4442706ddeb57b5f76a41f30786bec6fd6e1620c5eba95999c283c5ed8083161d258562ba4672651a2caab54
+  metadata.gz: a325a47eff59b3766cead44c9e81063773af594e224d96aa667b7015a7a469d10be65e0ecdb68b36db88645472ae320309e92872ba568c3ed32f8da4525b113e
+  data.tar.gz: 31881ac3bba3ac3e3afa0a1c87366ea1680c32189d07cbdcd62e7eee33b19712fb85c0198b91b2315377e1f16ad0a973c95083810ef0a125c4a385ea84774101

data/lib/kompiler/architectures/armv8a/instructions.rb

@@ -398,69 +398,64 @@ end
 	
 	{
 		keyword: "cmp",
-		operands: [{type: "register", restrictions: {reg_size: 64}}, {type: "immediate"}],
+		name: "Compare (immediate)",
+		description: "Subtracts an immediate value from a register value, and updates the condition flags based on the result.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}}, {type: "immediate"}],
 		mc_constructor: [
 			["bits", 1,1,1,1,1],
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
-			["get_bits", ["get_operand", 1], 0, 12], # Immediate offset zero			
-			["bits", 0, 0,1,0,0,0,1, 1, 1, 1],
+			["get_bits", ["get_operand", 1], 0, 12], # Immediate value	
+			["bits", 0, 0,1,0,0,0,1, 1, 1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []], # sf
 		],
 		bitsize: 32
 	},
 	
 	{
 		keyword: "cmp",
-		name: "CMP (two registers)",
-		description: "Compares two 64-bit registers and updates condition flags based on the result.",
-		operands: [{type: "register", restrictions: {reg_size: 64}, name: "Register 1"}, {type: "register", restrictions: {reg_size: 64}, name: "Register 2"}],
+		name: "Compare (registers)",
+		description: "Subtracts the second register value from the first register value, and updates the condition flags based on the result.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Register 1"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Register 2"}],
 		mc_constructor: [
+			["if_eq_else", ["get_key", ["get_operand", 0], :reg_size], ["get_key", ["get_operand", 1], :reg_size], [], ["raise_error", "cmp Error: Register sizes are not the same"]],
 			["bits", 1,1,1,1,1], # Rd
-			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
+			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5], # Rn
 			["get_bits", 0, 0, 6], # Immediate offset zero (shift amount)
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5], # Rm
 			["bits", 0],
 			["bits", 0, 0], # Shift type
-			["bits", 1,1,0,1,0,1,1,1],
-		],
-		bitsize: 32
-	},
-	
-	{
-		keyword: "cmp",
-		name: "CMP (two registers)",
-		description: "Compares two 32-bit registers and updates condition flags based on the result.",
-		operands: [{type: "register", restrictions: {reg_size: 32}, name: "Register 1"}, {type: "register", restrictions: {reg_size: 32}, name: "Register 2"}],
-		mc_constructor: [
-			["bits", 1,1,1,1,1], # Rd
-			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
-			["get_bits", 0, 0, 6], # Immediate offset zero (shift amount)
-			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5], # Rm
-			["bits", 0],
-			["bits", 0, 0], # Shift type
-			["bits", 1,1,0,1,0,1,1,0],
+			["bits", 1,1,0,1,0,1,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []], # sf
 		],
 		bitsize: 32
 	},
+
 	
 	{
 		keyword: "sub",
-		operands: [{type: "register", restrictions: {reg_size: 64}}, {type: "register", restrictions: {reg_size: 64}}, {type: "immediate"}],
+		name: "Subtract (immediate)",
+		description: "Subtract an immediate value from a register value, and store the result in the destination register",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Destination"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Source"}, {type: "immediate", name: "Immediate"}],
 		mc_constructor: [
+			["if_eq_else", ["get_key", ["get_operand", 0], :reg_size], ["get_key", ["get_operand", 1], :reg_size], [], ["raise_error", "sub Error: Register sizes are not the same"]],
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
 			["get_bits", ["get_operand", 2], 0, 12], # Immediate offset zero
 			["bits", 0], # Shift	
-			["bits", 0,1,0,0,0,1,0,1,1],
+			["bits", 0,1,0,0,0,1,0,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []], # sf
 		],
 		bitsize: 32
 	},
 	
 	{
 		keyword: "mul",
-		name: "MUL",
-		description: "Multiply the contents of two registers and store the output in the destination register.",
-		operands: [{type: "register", restrictions: {reg_type: "gpr"}}, {type: "register", restrictions: {reg_type: "gpr"}}, {type: "register", restrictions: {reg_type: "gpr"}}],
+		name: "Multiply",
+		description: "Multiply the contents of two registers, and store the output in the destination register.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Destination"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Register 1"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Register 2"}],
 		mc_constructor: [
+			["if_eq_else", ["get_key", ["get_operand", 0], :reg_size], ["get_key", ["get_operand", 1], :reg_size], [], ["raise_error", "mul Error: Register sizes are not the same"]], 
+			["if_eq_else", ["get_key", ["get_operand", 1], :reg_size], ["get_key", ["get_operand", 2], :reg_size], [], ["raise_error", "mul Error: Register sizes are not the same"]],
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5], # Rd
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5], # Rn
 			["bits", 1,1,1,1,1, 0], # Ra o0
@@ -473,6 +468,29 @@ end
 	},
 	
 	
+	{
+		keyword: "madd",
+		name: "Multiply-Add",
+		description: "Multiplies two register values, adds a third register value, and writes the result to the destination register.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Destination"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Register 1 (to multiply)"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Register 2 (to multiply)"}, {type: "register", restrictions: {reg_type: "gpr"}, name: "Register 3 (to add)"}],
+		mc_constructor: [
+			# Checks for register sizes being the same
+			["if_eq_else", ["get_key", ["get_operand", 0], :reg_size], ["get_key", ["get_operand", 1], :reg_size], [], ["raise_error", "madd Error: Register sizes are not the same"]], 
+			["if_eq_else", ["get_key", ["get_operand", 1], :reg_size], ["get_key", ["get_operand", 2], :reg_size], [], ["raise_error", "madd Error: Register sizes are not the same"]], 
+			["if_eq_else", ["get_key", ["get_operand", 2], :reg_size], ["get_key", ["get_operand", 3], :reg_size], [], ["raise_error", "madd Error: Register sizes are not the same"]], 
+
+			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5], # Rd
+			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5], # Rn
+			["get_bits", ["encode_gp_register", ["get_operand", 3]], 0, 5], #Ra
+			["bits", 0], # o0
+			["get_bits", ["encode_gp_register", ["get_operand", 2]], 0, 5], # Rm
+			["bits", 0,0,0, 1,1,0,1,1, 0,0],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []], # sf
+		],
+		bitsize: 32,
+	},
+	
+	
 	#
 	# B.cond instructions
 	#

data/lib/kompiler/parsers.rb

@@ -22,6 +22,8 @@ def self.parse_str(code)
 				str_content << "\r"
 			elsif code[i] == "\\"
 				str_content << "\\"
+			elsif code[i] == "0"
+				str_content << "\0"
 			else
 				str_content << "\\"
 				str_content << code[i]
@@ -145,6 +147,29 @@ def self.check_decimal_operand(str)
 end
 
 
+def self.check_char_operand(str)
+
+	# If doesn't start with ' or doesn't end with ', return false
+	if (str[0] != "'") || (str[-1] != "'")
+		return [false, nil]
+	end
+
+	# Use existing logic to parse the contents
+	to_parse = str.dup
+	to_parse[0] = '"'
+	to_parse[-1] = '"'
+	content, parse_i = parse_str(to_parse)
+	
+	# If more than one character, return false
+	if content.size != 1
+		return [false, nil]
+	end
+
+	return [true, content.encode("ascii").bytes[0]]
+end
+
+
+
 def self.check_immediate_operand(operand_str)
 	
 	is_bin, bin_value = check_binary_operand(operand_str)
@@ -156,6 +181,9 @@ def self.check_immediate_operand(operand_str)
 	is_hex, hex_value = check_hex_operand(operand_str)
 	return [true, {type: "immediate", value: hex_value, def_type: "hex"}] if is_hex
 	
+	is_char, char_value = check_char_operand(operand_str)
+	return [true, {type: "immediate", value: char_value, def_type: "char"}] if is_char
+	
 	return [false, nil]
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kompiler
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.1
+  version: 0.2.0.pre.2
 platform: ruby
 authors:
 - Kyryl Shyshko