kompiler 0.1.2 → 0.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 358077245911280980e98b213394c395224c5ee04f4b81b449a073582567eb46
-  data.tar.gz: bdaae177e9ef79b9628eaae6e9e506c69d9951f89ff387c28532940fd67d2f90
+  metadata.gz: 36f0387094d41fc93e8f85e56446392a1941cbcd115bf94c3ffd799c3d85cc78
+  data.tar.gz: 63a7973c95797b77119b47f24b8aa5bda591d7d2a4e5cbd5e34485fb11aea9b7
 SHA512:
-  metadata.gz: c238947087f8d2032816abbe9882df8906b53de123e382ebc662aa3461e560ff69d5001e5ecdc8d28793bdd495a669ec36873d5d6792bfc0cc7396f423d96edd
-  data.tar.gz: 747cacbc92d042db6bf1ed5569bb7727ce29694c9c8f4cc6e24c625f26aee73532eb5ea6b93763f47c8e0f3819a43012919dd922b9155c035c43247e4fd0c9ec
+  metadata.gz: 761aed3357cef9084d7dc0e7d8f9a73bb6dc883c7b1fc2cb5b0ee8b6499aa3f1f972bcc48d8d8adb2a3bd7f793738b28c1a37a21c17152d958cb79e39c7f8dab
+  data.tar.gz: dae7000f44475fdcb2c6c8e78c82f638ca09790c4442706ddeb57b5f76a41f30786bec6fd6e1620c5eba95999c283c5ed8083161d258562ba4672651a2caab54

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

@@ -275,33 +275,28 @@ end
 		],
 		bitsize: 32
 	},
+	
 	{
 		keyword: "ldr",
-		operands: [{type: "register", restrictions: {reg_size: 64}}, {type: "register", restrictions: {reg_size: 64}}],
-		mc_constructor: [
-			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
-			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
-			["get_bits", 0, 0, 12], # Immediate offset zero			
-			["bits", 1,0, 1,0, 0, 1,1,1, 1,1],
-		],
-		bitsize: 32
-	},
-	{
-		keyword: "ldr",
-		operands: [{type: "register", restrictions: {reg_size: 32}}, {type: "register", restrictions: {reg_size: 64}}],
+		name: "Load Register",
+		description: "Loads 4 or 8 bytes from memory at the address in the second register, and writes it to the destination register",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Destination"}, {type: "register", restrictions: {reg_type: "gpr", reg_size: 64}, name: "Source address"}],
 		mc_constructor: [
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
 			["get_bits", 0, 0, 12], # Immediate offset zero			
-			["bits", 1,0, 1,0, 0, 1,1,1, 0,1],
+			["bits", 1,0, 1,0, 0, 1,1,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []],
+			["bits", 1],
 		],
 		bitsize: 32
 	},
+	
 	{
 		keyword: "ldrb",
 		name: "Load Register Byte",
 		description: "Loads a byte from memory and writes the result to the destination register.",
-		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Destination"}, {type: "register", restrictions: {reg_size: 64, reg_type: "gpr"}, name: "Source address"}],
+		operands: [{type: "register", restrictions: {reg_type: "gpr", reg_size: 32}, name: "Destination"}, {type: "register", restrictions: {reg_size: 64, reg_type: "gpr"}, name: "Source address"}],
 		mc_constructor: [
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
@@ -321,41 +316,19 @@ end
 		],
 		bitsize: 32
 	},
-	{
-		keyword: "str",
-		description: "Stores the contents of a 32 bit register at the address specified by the second register",
-		operands: [{type: "register", restrictions: {reg_size: 32}, name: "Content"}, {type: "register", restrictions: {reg_size: 64}, name: "Address"}],
-		mc_constructor: [
-			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
-			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
-			["get_bits", 0, 0, 12], # Immediate offset zero			
-			["bits", 0,0, 1,0, 0, 1,1,1, 0,1],
-		],
-		bitsize: 32
-	},
-	{
-		keyword: "str",
-		description: "Stores the contents of a 64 bit register at the address specified by the second register",
-		operands: [{type: "register", restrictions: {reg_size: 64}, name: "Content"}, {type: "register", restrictions: {reg_size: 64}, name: "Address"}],
-		mc_constructor: [
-			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
-			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
-			["get_bits", 0, 0, 12], # Immediate offset zero			
-			["bits", 0,0, 1,0, 0, 1,1,1, 1,1],
-		],
-		bitsize: 32
-	},
 	
 	{
-		keyword: "str_unsigned",
-		name: "STR (immediate), unsigned offset",
-		description: "Stores the contents of a 32 bit register at the address specified by the second register with an unsigned immediate offset.",
-		operands: [{type: "register", restrictions: {reg_size: 32}, name: "Content"}, {type: "register", restrictions: {reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
+		keyword: "str",
+		name: "Store",
+		description: "Stores the contents of a 64 bit register at the address specified by the second register.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Content"}, {type: "register", restrictions: {reg_type: "gpr", reg_size: 64}, name: "Address"}],
 		mc_constructor: [
 			["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,0, 1,0, 0, 1,1,1, 0,1],
+			["get_bits", 0, 0, 12],	
+			["bits", 0,0, 1,0, 0, 1,1,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []],
+			["bits", 1] # size second bit always 1
 		],
 		bitsize: 32
 	},
@@ -364,42 +337,60 @@ end
 		keyword: "str_unsigned",
 		name: "STR (immediate), unsigned offset",
 		description: "Stores the contents of a 64 bit register at the address specified by the second register with an unsigned immediate offset.",
-		operands: [{type: "register", restrictions: {reg_size: 64}, name: "Content"}, {type: "register", restrictions: {reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Content"}, {type: "register", restrictions: {reg_type: "gpr", reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
 		mc_constructor: [
+			["case", ["get_key", ["get_operand", 0], :reg_size],
+				64, ["if_eq_else", ["modulo", ["get_operand", 2], 8], 0, [], ["raise_error", "str_unsigned Error: Unsigned offset must be divisible by 8 for 64-bit registers."]],
+				32, ["if_eq_else", ["modulo", ["get_operand", 2], 4], 0, [], ["raise_error", "str_unsigned Error: Unsigned offset must be divisible by 4 for 32-bit registers."]],
+				[]
+			],
 			["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,0, 1,0, 0, 1,1,1, 1,1],
+			["get_bits",
+				["case", ["get_key", ["get_operand", 0], :reg_size],
+					64, ["divide", ["get_operand", 2], 8],
+					32, ["divide", ["get_operand", 2], 4],
+					["get_operand", 2]
+				],
+			0, 12],	
+			["bits", 0,0, 1,0, 0, 1,1,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []],
+			["bits", 1] # size second bit always 1
 		],
 		bitsize: 32
 	},
 	
+	
 	{
 		keyword: "str_pre_index",
 		name: "STR (immediate), signed offset, pre-index",
-		description: "Stores the contents of a 64-bit register at the address specified by the second register with a signed immediate offset that is added before storing.",
-		operands: [{type: "register", restrictions: {reg_size: 64}, name: "Content"}, {type: "register", restrictions: {reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
+		description: "Stores the contents of a general purpose register at the address specified by the second register with an immediate offset added before writing.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Content"}, {type: "register", restrictions: {reg_type: "gpr", reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
 		mc_constructor: [
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
 			["bits", 1, 1],
 			["get_bits", ["get_operand", 2], 0, 9],	
-			["bits", 0, 0,0, 0,0, 0, 1,1,1, 1,1],
+			["bits", 0, 0,0, 0,0, 0, 1,1,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []],
+			["bits", 1] # size second bit always 1
 		],
 		bitsize: 32
 	},
 	
 	{
-		keyword: "str_pre_index",
-		name: "STR (immediate), signed offset, pre-index",
-		description: "Stores the contents of a 32-bit register at the address specified by the second register with a signed immediate offset that is added before storing.",
-		operands: [{type: "register", restrictions: {reg_size: 32}, name: "Content"}, {type: "register", restrictions: {reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
+		keyword: "str_post_index",
+		name: "STR (immediate), signed offset, post-index",
+		description: "Stores the contents of a general purpose register at the address specified by the second register, with an immediate offset added after writing.",
+		operands: [{type: "register", restrictions: {reg_type: "gpr"}, name: "Content"}, {type: "register", restrictions: {reg_type: "gpr", reg_size: 64}, name: "Address"}, {type: "immediate", name: "Address Offset"}],
 		mc_constructor: [
 			["get_bits", ["encode_gp_register", ["get_operand", 0]], 0, 5],
 			["get_bits", ["encode_gp_register", ["get_operand", 1]], 0, 5],
-			["bits", 1, 1],
+			["bits", 1, 0],
 			["get_bits", ["get_operand", 2], 0, 9],	
-			["bits", 0, 0,0, 0,0, 0, 1,1,1, 0,1],
+			["bits", 0, 0,0, 0,0, 0, 1,1,1],
+			["case", ["get_key", ["get_operand", 0], :reg_size], 64, ["bits", 1], 32, ["bits", 0], []],
+			["bits", 1] # size second bit always 1
 		],
 		bitsize: 32
 	},

data/lib/kompiler/mc_builder.rb

@@ -28,6 +28,16 @@ MC_AST_NODES = [
 	{name: "get_label_address", n_args: 1, func: lambda {|args, state| state[:labels].include?(args[0]) ? state[:labels][args[0]] : raise("Label \"#{args[0]}\" not found: Program build not possible") } },
 	{name: "bits", n_args: "any", func: lambda {|args, state| args } },
 	{name: "if_eq_else", n_args: 4, eval_args: false, func: lambda {|args, state| (eval_mc_node_arg(args[0], state) == eval_mc_node_arg(args[1], state)) ? eval_mc_node_arg(args[2], state) : eval_mc_node_arg(args[3], state) }},
+	{name: "case", n_args: "any", eval_args: false, func: lambda do |args, state| 
+		value = eval_mc_node_arg(args[0], state)
+		raise "Incorrect use of the \"case\" MC Constructor: incorrect number of arguments. This is likely a problem with the architecture, not the program being compiled." if (args.size - 2) % 2 != 0
+		args[1...-1].each_slice(2) do |check_value, block|
+			if value == check_value
+				return eval_mc_node_arg(block, state)
+			end
+		end
+		eval_mc_node_arg(args.last, state)
+	end},
 	{name: "raise_error", n_args: 1, func: lambda {|args, state| raise args[0] } },
 	{name: "get_key", n_args: 2, func: lambda {|args, state| args[0][args[1]] }},
 ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kompiler
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.pre.1
 platform: ruby
 authors:
 - Kyryl Shyshko
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-27 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies: []
 description: 'Kompiler is a low-level, modular and extendable compiler for any architecture.
   By default Kompiler supports ARMv8-a, but other architecture extensions can be downloaded