gruesome 0.0.3 → 0.0.4

data/lib/gruesome/z/dictionary.rb

@@ -9,148 +9,148 @@ require_relative 'header'
 require_relative 'zscii'
 
 module Gruesome
-	module Z
-		class Dictionary
-			def initialize(memory)
-				@memory = memory
-				@header = Header.new(@memory.contents)
-
-				@abbreviation_table = AbbreviationTable.new(@memory)
-
-				@lookup_cache = {}
-			end
-
-			def address
-				@header.dictionary_addr
-			end
-
-			def address_of_entries
-				addr = self.address
-				num_input_codes = @memory.force_readb(addr)
-				addr += 1
-				addr += num_input_codes
-				addr += 3
-
-				addr
-			end
-
-			def entry_length
-				addr = self.address_of_entries - 3
-				return @memory.force_readb(addr)
-			end
-
-			def number_of_words
-				addr = self.address_of_entries - 2
-				return @memory.force_readw(addr)
-			end
-
-			def word_address(index)
-				addr = address_of_entries
-				addr += entry_length * index
-
-				return addr
-			end
-
-			def word(index)
-				addr = word_address(index)
-
-				codes = nil
-
-				if @header.version <= 3
-					codes = @memory.force_readzstr(addr, 4)[1]
-				else
-					codes = @memory.force_readzstr(addr, 6)[1]
-				end
-
-				str = ZSCII.translate(0, @header.version, codes, @abbreviation_table)
-				@lookup_cache[str] = index
-				return str
-			end
-
-			def lookup_word(token)
-				if token.length > 6 and @header.version <= 3
-					token = token[0..5]
-				elsif token.length > 9
-					token = token[0..8]
-				end
-				cached_index = @lookup_cache[token]
-				if cached_index != nil
-					if self.word(cached_index) == token
-						return cached_index
-					end
-				end
-
-				number_of_words.times do |i|
-					if word(i) == token
-						cached_index = i
-						break
-					end
-				end
-				
-				cached_index
-			end
-
-			def word_separators
-				addr = self.address
-
-				# the number of word separators
-				num_input_codes = @memory.force_readb(addr)
-				addr += 1
-
-				codes = []
-				num_input_codes.times do
-					codes << @memory.force_readb(addr)
-					addr += 1
-				end
-
-				codes = codes.map do |i|
-					ZSCII.translate_Zchar(i)
-				end
-
-				return codes
-			end
-
-			def tokenize(line)
-				orig_line = line
-
-				# I. ensure that word separators are surrounded by spaces
-				self.word_separators.each do |sep|
-					line = line.gsub(sep, " " + sep + " ")
-				end
-
-				# II. break up the line into words delimited by spaces
-				tokens = line.split(' ')
-
-				line = orig_line
-				last_pos = 0
-				ret = tokens.map do |token|
-					index = line.index(token)
-					line = line[index+token.size..-1]
-
-					index = index + last_pos
-					last_pos = index + token.size
-
-					index
-					{ :position => index, :string => token }
-				end
-				
-				ret
-			end
-
-			def parse(tokens)
-				ret = []
-				tokens.each do |token|
-					index = lookup_word(token[:string])
-					if index != nil
-						addr = word_address(index)
-					else
-						addr = 0
-					end
-					ret << { :size => token[:string].size, :address => addr, :position => token[:position] }
-				end
-
-				ret
-			end
-		end
-	end
+  module Z
+    class Dictionary
+      def initialize(memory)
+        @memory = memory
+        @header = Header.new(@memory.contents)
+
+        @abbreviation_table = AbbreviationTable.new(@memory)
+
+        @lookup_cache = {}
+      end
+
+      def address
+        @header.dictionary_addr
+      end
+
+      def address_of_entries
+        addr = self.address
+        num_input_codes = @memory.force_readb(addr)
+        addr += 1
+        addr += num_input_codes
+        addr += 3
+
+        addr
+      end
+
+      def entry_length
+        addr = self.address_of_entries - 3
+        return @memory.force_readb(addr)
+      end
+
+      def number_of_words
+        addr = self.address_of_entries - 2
+        return @memory.force_readw(addr)
+      end
+
+      def word_address(index)
+        addr = address_of_entries
+        addr += entry_length * index
+
+        return addr
+      end
+
+      def word(index)
+        addr = word_address(index)
+
+        codes = nil
+
+        if @header.version <= 3
+          codes = @memory.force_readzstr(addr, 4)[1]
+        else
+          codes = @memory.force_readzstr(addr, 6)[1]
+        end
+
+        str = ZSCII.translate(0, @header.version, codes, @abbreviation_table)
+        @lookup_cache[str] = index
+        return str
+      end
+
+      def lookup_word(token)
+        if token.length > 6 and @header.version <= 3
+          token = token[0..5]
+        elsif token.length > 9
+          token = token[0..8]
+        end
+        cached_index = @lookup_cache[token]
+        if cached_index != nil
+          if self.word(cached_index) == token
+            return cached_index
+          end
+        end
+
+        number_of_words.times do |i|
+          if word(i) == token
+            cached_index = i
+            break
+          end
+        end
+        
+        cached_index
+      end
+
+      def word_separators
+        addr = self.address
+
+        # the number of word separators
+        num_input_codes = @memory.force_readb(addr)
+        addr += 1
+
+        codes = []
+        num_input_codes.times do
+          codes << @memory.force_readb(addr)
+          addr += 1
+        end
+
+        codes = codes.map do |i|
+          ZSCII.translate_Zchar(i)
+        end
+
+        return codes
+      end
+
+      def tokenize(line)
+        orig_line = line
+
+        # I. ensure that word separators are surrounded by spaces
+        self.word_separators.each do |sep|
+          line = line.gsub(sep, " " + sep + " ")
+        end
+
+        # II. break up the line into words delimited by spaces
+        tokens = line.split(' ')
+
+        line = orig_line
+        last_pos = 0
+        ret = tokens.map do |token|
+          index = line.index(token)
+          line = line[index+token.size..-1]
+
+          index = index + last_pos
+          last_pos = index + token.size
+
+          index
+          { :position => index, :string => token }
+        end
+        
+        ret
+      end
+
+      def parse(tokens)
+        ret = []
+        tokens.each do |token|
+          index = lookup_word(token[:string])
+          if index != nil
+            addr = word_address(index)
+          else
+            addr = 0
+          end
+          ret << { :size => token[:string].size, :address => addr, :position => token[:position] }
+        end
+
+        ret
+      end
+    end
+  end
 end

data/lib/gruesome/z/header.rb

@@ -1,46 +1,46 @@
 require 'bit-struct'
 
 module Gruesome
-	module Z
+  module Z
 
-		# Z-Story File Header
-		class Header < BitStruct
-			default_options :endian => :big
+    # Z-Story File Header
+    class Header < BitStruct
+      default_options :endian => :big
 
-			unsigned :version, 8, "Z-Machine Version"
-			unsigned :availablity_flags, 8, "Availability Flags"
-			unsigned :reservedw1, 16, "Reserved Word 1"
-			unsigned :high_mem_base, 16, "High Memory Base"
-			unsigned :entry, 16, "Entry Point"
-			unsigned :dictionary_addr, 16, "Address of Dictionary"
-			unsigned :object_tbl_addr, 16, "Address of Object Table"
-			unsigned :global_var_addr, 16, "Address of Global Variables Table"
-			unsigned :static_mem_base, 16, "Static Memory Base"
-			unsigned :capability_flags, 8, "Desired Capability Flags"
-			unsigned :reservedb1, 8, "Reserved Byte 1"
-			unsigned :reservedw2, 16, "Reserved Word 2"
-			unsigned :reservedw3, 16, "Reserved Word 3"
-			unsigned :reservedw4, 16, "Reserved Word 4"
-			unsigned :abbrev_tbl_addr, 16, "Address of Abbreviations Table"
-			unsigned :file_length, 16, "Length of File"
-			unsigned :checksum, 16, "Checksum of File"
-			unsigned :interpreter_number, 8, "Interpreter Number"
-			unsigned :interpreter_version, 8, "Interpreter Version"
-			unsigned :screen_height, 8, "Screen Height (in Lines)"
-			unsigned :screen_width, 8, "Screen Height (in Characters)"
-			unsigned :screen_width_units, 16, "Screen Width (in Units)"
-			unsigned :screen_height_units, 16, "Screen Height (in Units)"
-			unsigned :font_width, 8, "Font Width (in Units)"
-			unsigned :font_height, 8, "Font Height (in Units)"
-			unsigned :routines_addr, 16, "Offset to Routines (Divided by 8)"
-			unsigned :static_str_addr, 16, "Offset to Static Strings (Divided by 8)"
-			unsigned :background_color, 8, "Default Background Color"
-			unsigned :foreground_color, 8, "Default Foreground Color"
-			unsigned :terminating_chars_tbl_addr, 16, "Address of Terminating Characters Table"
-			unsigned :output_stream_3_width, 16, "Total Width of Characters Send to Output Stream 3"
-			unsigned :revision_number, 16, "Standard Revision Number"
-			unsigned :alphabet_tbl_addr, 16, "Address of Alphabet Table"
-			unsigned :header_ext_tbl_addr, 16, "Address of Header Extension Table"
-		end
-	end
+      unsigned :version, 8, "Z-Machine Version"
+      unsigned :availablity_flags, 8, "Availability Flags"
+      unsigned :reservedw1, 16, "Reserved Word 1"
+      unsigned :high_mem_base, 16, "High Memory Base"
+      unsigned :entry, 16, "Entry Point"
+      unsigned :dictionary_addr, 16, "Address of Dictionary"
+      unsigned :object_tbl_addr, 16, "Address of Object Table"
+      unsigned :global_var_addr, 16, "Address of Global Variables Table"
+      unsigned :static_mem_base, 16, "Static Memory Base"
+      unsigned :capability_flags, 8, "Desired Capability Flags"
+      unsigned :reservedb1, 8, "Reserved Byte 1"
+      unsigned :reservedw2, 16, "Reserved Word 2"
+      unsigned :reservedw3, 16, "Reserved Word 3"
+      unsigned :reservedw4, 16, "Reserved Word 4"
+      unsigned :abbrev_tbl_addr, 16, "Address of Abbreviations Table"
+      unsigned :file_length, 16, "Length of File"
+      unsigned :checksum, 16, "Checksum of File"
+      unsigned :interpreter_number, 8, "Interpreter Number"
+      unsigned :interpreter_version, 8, "Interpreter Version"
+      unsigned :screen_height, 8, "Screen Height (in Lines)"
+      unsigned :screen_width, 8, "Screen Height (in Characters)"
+      unsigned :screen_width_units, 16, "Screen Width (in Units)"
+      unsigned :screen_height_units, 16, "Screen Height (in Units)"
+      unsigned :font_width, 8, "Font Width (in Units)"
+      unsigned :font_height, 8, "Font Height (in Units)"
+      unsigned :routines_addr, 16, "Offset to Routines (Divided by 8)"
+      unsigned :static_str_addr, 16, "Offset to Static Strings (Divided by 8)"
+      unsigned :background_color, 8, "Default Background Color"
+      unsigned :foreground_color, 8, "Default Foreground Color"
+      unsigned :terminating_chars_tbl_addr, 16, "Address of Terminating Characters Table"
+      unsigned :output_stream_3_width, 16, "Total Width of Characters Send to Output Stream 3"
+      unsigned :revision_number, 16, "Standard Revision Number"
+      unsigned :alphabet_tbl_addr, 16, "Address of Alphabet Table"
+      unsigned :header_ext_tbl_addr, 16, "Address of Header Extension Table"
+    end
+  end
 end

data/lib/gruesome/z/instruction.rb

@@ -1,50 +1,50 @@
 module Gruesome
-	module Z
+  module Z
 
-		# A Z-Machine instruction
-		class Instruction
-			attr_reader :opcode			# the opcode
-			attr_reader :types			# the types of the operands
-			attr_reader :operands		# the operands given to the instruction
-			attr_reader :destination	# the destination variable to place the result
-			attr_reader :branch_to		# the address to set the pc when branch is taken 
-										#  also... if 0, return true from routine
-										#          if 1, return false from routine
-			attr_reader :branch_on		# the condition is matched against this
-			attr_reader :length			# instruction size in number of bytes
+    # A Z-Machine instruction
+    class Instruction
+      attr_reader :opcode      # the opcode
+      attr_reader :types      # the types of the operands
+      attr_reader :operands    # the operands given to the instruction
+      attr_reader :destination  # the destination variable to place the result
+      attr_reader :branch_to    # the address to set the pc when branch is taken 
+                    #  also... if 0, return true from routine
+                    #          if 1, return false from routine
+      attr_reader :branch_on    # the condition is matched against this
+      attr_reader :length      # instruction size in number of bytes
 
-			def initialize(opcode, types, operands, destination, branch_destination, branch_condition, length)
-				@opcode = opcode
-				@types = types
-				@operands = operands
-				@destination = destination
-				@branch_to = branch_destination
-				@branch_on = branch_condition
-				@length = length
-			end
+      def initialize(opcode, types, operands, destination, branch_destination, branch_condition, length)
+        @opcode = opcode
+        @types = types
+        @operands = operands
+        @destination = destination
+        @branch_to = branch_destination
+        @branch_on = branch_condition
+        @length = length
+      end
 
-			def to_s(version)
-				line = Opcode.name(@opcode, version)
-				idx = -1
-				line = line + @operands.inject("") do |result, element|
-					idx += 1
-					if @types[idx] == OperandType::VARIABLE
-						result + " %" + sprintf("%02x", element)
-					else
-						result + " " + element.to_s
-					end
-				end
+      def to_s(version)
+        line = Opcode.name(@opcode, version)
+        idx = -1
+        line = line + @operands.inject("") do |result, element|
+          idx += 1
+          if @types[idx] == OperandType::VARIABLE
+            result + " %" + sprintf("%02x", element)
+          else
+            result + " " + element.to_s
+          end
+        end
 
-				if @destination != nil
-					line = line + " -> %" + sprintf("%02x", @destination)
-				end
+        if @destination != nil
+          line = line + " -> %" + sprintf("%02x", @destination)
+        end
 
-				if @branch_to != nil
-					line = line + " goto $" + sprintf("%04x", @branch_to) + " on " + @branch_on.to_s
-				end
+        if @branch_to != nil
+          line = line + " goto $" + sprintf("%04x", @branch_to) + " on " + @branch_on.to_s
+        end
 
-				line
-			end
-		end
-	end
+        line
+      end
+    end
+  end
 end

data/lib/gruesome/z/machine.rb

@@ -6,66 +6,67 @@ require_relative 'abbreviation_table'
 require_relative 'object_table'
 
 module Gruesome
-	module Z
+  module Z
 
-		# The class that initializes and maintains a Z-Machine
-		class Machine
+    # The class that initializes and maintains a Z-Machine
+    class Machine
 
-			# Will create a new virtual machine for the game file
-			def initialize(game_file)
-				file = File.open(game_file, "r")
+      # Will create a new virtual machine for the game file
+      def initialize(game_file)
+        file = File.open(game_file, "rb")
 
-				# I. Create memory space
+        # I. Create memory space
 
-				memory_size = File.size(game_file)
-				@memory = Memory.new(file.read(memory_size))
+        memory_size = File.size(game_file)
+        save_file_name = File.basename(file, File.extname(file)) + ".sav"
+        @memory = Memory.new(file.read(memory_size), save_file_name)
 
-				# Set flags
-				flags = @memory.force_readb(0x01)
-				flags &= ~(0b1110000)
-				@memory.force_writeb(0x01, flags)
+        # Set flags
+        flags = @memory.force_readb(0x01)
+        flags &= ~(0b1110000)
+        @memory.force_writeb(0x01, flags)
 
-				# Set flags 2
-				flags = @memory.force_readb(0x10)
-				flags &= ~(0b11111100)
-				@memory.force_writeb(0x10, flags)
+        # Set flags 2
+        flags = @memory.force_readb(0x10)
+        flags &= ~(0b11111100)
+        @memory.force_writeb(0x10, flags)
 
-				# II. Read header (at address 0x0000) and associated tables
-				@header = Header.new(@memory.contents)
-				@object_table = ObjectTable.new(@memory)
+        # II. Read header (at address 0x0000) and associated tables
+        @header = Header.new(@memory.contents)
+        @object_table = ObjectTable.new(@memory)
 
-				# III. Instantiate CPU
-				@decoder = Decoder.new(@memory)
-				@processor = Processor.new(@memory)
-			end
+        # III. Instantiate CPU
+        @decoder = Decoder.new(@memory)
+        @processor = Processor.new(@memory)
+      end
 
-			def execute
-				while true do
-					i = @decoder.fetch
-					#var = @memory.readv(0)
-					#if var != nil
-					#	puts "var %00 = " + sprintf("%04x", var)
-					#	@memory.writev(0, var)
-					#end
-					#var = @memory.readv(1)
-					#if var != nil
-					#	puts "var %01 = " + sprintf("%04x", @memory.readv(0x01))
-					#end
-					#puts "at $" + sprintf("%04x", @memory.program_counter) + ": " + i.to_s(@header.version)
-					@memory.program_counter += i.length
+      def execute
+        while true do
+          i = @decoder.fetch
+#          var = @memory.readv(0)
+#          if var != nil
+#            puts "var %00 = " + sprintf("%04x", var)
+#            @memory.writev(0, var)
+#          end
+#          var = @memory.readv(1)
+#          if var != nil
+#            puts "var %01 = " + sprintf("%04x", @memory.readv(0x01))
+#          end
+#          puts "at $" + sprintf("%04x", @memory.program_counter) + ": " + i.to_s(@header.version)
+          @memory.program_counter += i.length
 
-					if i.opcode == Opcode::QUIT
-						break
-					end
+          if i.opcode == Opcode::QUIT
+            break
+          end
 
-					begin
-						@processor.execute(i)
-					rescue RuntimeError => fuh
-						"error at $" + sprintf("%04x", @memory.program_counter) + ": " + i.to_s(@header.version)
-					end
-				end
-			end
-		end
-	end
+          begin
+            @processor.execute(i)
+          rescue RuntimeError => fuh
+            puts "error at $" + sprintf("%04x", @memory.program_counter) + ": " + i.to_s(@header.version)
+          end
+        end
+      end
+    end
+  end
 end