ripxplore 0.16.1 → 0.17.0

data/lib/LibRipXplore.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'open-uri'
 class RipXplore
 
-VERSION="0.16.1"
+VERSION="0.17.0"
 
 private
 def RipXplore.require_files_in_subdir(dirname)

data/lib/disassemblers/D65.rb

@@ -129,6 +129,19 @@ end
 				else 
 					abort("unknown symbol #{operand_type}")
 			end
+			
+			
+			#try and track A,X,Y values (so we can decode function dispatchers
+			a_value= (operand_type==:imm) ? next_byte : nil if (opcode_name=='LDA')
+			x_value= (operand_type==:imm) ? next_byte : nil if (opcode_name=='LDX')
+			y_value= (operand_type==:imm) ? next_byte : nil if (opcode_name=='LDY')
+			
+
+			a_value=x_value if opcode_name=='TXA'
+			x_value=a_value if opcode_name=='TAX'
+			a_value=y_value if opcode_name=='TYA'
+			y_value=a_value if opcode_name=='TAY'
+			
 			operand = sprintf(operand_format,operand_address)
 			opcode_size=OPCODE_SIZE[operand_type]
 			instruction_bytes=case opcode_size
@@ -142,16 +155,43 @@ end
       if annotation.nil? then
         annotation=symbols[operand_address] unless symbols.nil?
         if (annotation && (operand_type!=:imm)) then
-          s<<"  "+annotation.to_s
-        end
+		  if annotation.is_a?(String) then
+		  	s<<"  "+annotation
+		  else 
+		  	dispatcher_name=annotation[0]
+		  	full_description=""
+            annotation.each do |item|
+            	next if item.is_a?(String)
+            	next unless item['a'].nil? || item['a'].to_i==a_value
+            	next unless item['x'].nil? || item['x'].to_i==x_value
+            	next unless item['y'].nil? || item['y'].to_i==y_value
+				full_description=item['caption']
+        	end
+        	s<<"  #{dispatcher_name} #{full_description}"
+          end
+         end
       else
           s<<"  @@"+annotation.to_s
       end
-			s<< "\n"
-			index+=opcode_size
-		end
+	 if ['JSR','JMP'].include?(opcode_name) then
+		s<<" A=$%02X" % a_value unless a_value.nil?
+		s<<" X=$%02X" % x_value unless x_value.nil?
+		s<<" Y=$%02X" % y_value unless y_value.nil?
+	 end
+      
+	  s<< "\n"
+	  index+=opcode_size
+
+#reset a,x,y if we can't be sure of current value	  
+  	  if !['LDA','LDX','LDY','STA','STX','STY','CLC','CLD','CLV','CLZ','CLI','CMP','CPX','CPY','PHA','PHP','SEC','SED','SEI','TXA','TAX','TYA','TAY','TXS'].include?(opcode_name) then
+	 	a_value=nil
+		x_value=nil
+		y_value=nil
+	   end
+	  
+	  end
 	
-		s
+	  s
 	end
 
 end

data/lib/file_systems/AcornDFS.rb

@@ -0,0 +1,84 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+$:.unshift(File.dirname(__FILE__+"\\..")) unless
+	$:.include?(File.dirname(__FILE__+"\\..")) || $:.include?(File.expand_path(File.dirname(__FILE__+"\\..")))
+
+
+require 'FileSystem'
+
+#http://beebwiki.jonripley.com/Acorn_DFS_disc_format
+class AcornDFS<FileSystem
+
+def self.host_system
+  AcornBBC
+end  
+
+is_valid_file_system_if lambda {
+	# check that byte 5, sector 1 (ptr to next free catalogue entry) is a multiple of 8
+	sector_1=file_system_image.get_sector(0,1)
+	return false unless sector_1[5] % 8 == 0
+	# check the sector count is between 2 and 1023
+	sector_count_high_bits=sector_1[6] %  2
+	sector_count_low_bits=sector_1[7] 
+	sector_count=sector_count_high_bits*0x100+sector_count_low_bits
+	return false unless sector_count.between?(2,1023)
+	true    
+}
+
+  def self.files(file_system_image)
+	files=FileContainer.new
+	
+	sector_0=file_system_image.get_sector(0,0)
+	sector_1=file_system_image.get_sector(0,1)
+	volume_name=sector_1[0..3]+sector_0[0..7]+" (#{"%02x" % sector_1[4].to_i})"
+	file_system_image.volume_name=volume_name.tr("\000",".")
+	file_count=sector_1[5] / 8
+	file_count.times do |i|
+		entry_start=(i+1)*8
+		filename="#{sector_0[entry_start+7,1]}.#{sector_0[entry_start,7]}".strip
+		entry=sector_1[entry_start,8]
+		load_address=entry[0]+(entry[1]<<8)+(0x55*((entry[6]>>2)%4)<<16)
+		exec_address=entry[2]+(entry[3]<<8)+(0x55*((entry[6]>>6)%4)<<16)
+		length=entry[4]+(entry[5]<<8)+(((entry[6]>>4)%4)<<16)
+		start_sector=((entry[6]% 4)<<8)+entry[7]
+#		puts "%x %x %x %x #{filename}" % [load_address,exec_address,length,start_sector]
+		raw_bytes=""
+		((length+255)/0x100).times do |i|
+			track = (start_sector+i)/10
+			sector= (start_sector+i) % 10
+			raw_bytes<<file_system_image.get_sector(track,sector)
+		end
+		file_contents=raw_bytes[0,length]
+		files<<NativeFileType.best_fit(file_system_image,filename,file_contents,nil,load_address)
+	end
+	files
+  end
+  
+end
+
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2011 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/file_systems/C64BlazinForthBlocks.rb

@@ -0,0 +1,68 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+$:.unshift(File.dirname(__FILE__+"\\..")) unless
+	$:.include?(File.dirname(__FILE__+"\\..")) || $:.include?(File.expand_path(File.dirname(__FILE__+"\\..")))
+
+
+require 'FileSystem'
+# 
+# Blazin Forth source code screens
+#
+
+class C64BlazinForthBlocks<FileSystem
+
+def self.host_system
+  C64
+end  
+
+is_valid_file_system_if lambda {file_system_image.image_format.respond_to?(:dir_track_no)}
+
+
+#look for the the first file in the directory to be a USR file that starts with "it only looks"
+# the few BF screen d64s I have access to all have a directory that reads 
+#
+#  it only looks
+#  empty. this disk
+#  has xx screens
+#  of forth xxxxx
+# for blazin forth
+is_valid_file_system_if lambda {
+	dir_sector=file_system_image.get_sector(0x12,0x01)
+	is_valid=true
+	is_valid=false unless dir_sector[02]==0x83 #is first file a USR?
+	filename=dir_sector[5,13]
+	is_valid=false unless filename=="IT ONLY LOOKS" #is first file called "it only looks"?
+	is_valid
+}
+def self.files(file_system_image)
+[]
+end
+
+
+end
+  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008,2009,2010 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/host_systems/AcornBBC.rb

@@ -0,0 +1,57 @@
+$:.unshift(File.dirname(__FILE__)) unless
+	$:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+$:.unshift(File.dirname(__FILE__+"\\..")) unless
+	$:.include?(File.dirname(__FILE__+"\\..")) || $:.include?(File.expand_path(File.dirname(__FILE__+"\\..")))
+
+
+require 'HostSystem'
+class AcornBBC<HostSystem
+
+def self.full_name
+    "Acorn BBC"
+end  
+
+
+def self.start_track
+    0
+end
+
+@@symbols=nil
+def self.symbols
+  @@symbols=YAML::load(File.open(File.dirname(__FILE__)+"/acorn_symbols.yaml")) if @@symbols.nil?
+  @@symbols
+end
+
+def self.disassemble(buffer,start_address=0)
+  require 'D65'
+  D65.disassemble(buffer,start_address,symbols)  
+end
+
+
+end  
+# == Author
+# Jonno Downes (jonno@jamtronix.com)
+#
+# == Copyright
+# Copyright (c) 2008 Jonno Downes (jonno@jamtronix.com)
+#
+#Permission is hereby granted, free of charge, to any person obtaining
+#a copy of this software and associated documentation files (the
+#"Software"), to deal in the Software without restriction, including
+#without limitation the rights to use, copy, modify, merge, publish,
+#distribute, sublicense, and/or sell copies of the Software, and to
+#permit persons to whom the Software is furnished to do so, subject to
+#the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+

data/lib/host_systems/Atari800.rb

@@ -132,6 +132,39 @@ def self.default_background_colour
 PNG::Color.new(0x00,0x51,0x84,0xFF)	
 end
 
+def self.palette
+	if @palette.nil? then
+		@palette=Array.new(256)
+		256.times do |val|
+			cr = (val >> 4) & 15
+			lm = val & 15
+			crlv = (cr!=0 ? 50.0 : 0.0)
+		  
+			phase = ((cr-1)*25.0 - 58.0) * (2.0 * Math::PI / 360.0)
+		
+			y = 255.0*(lm+1.0)/16.0
+			i = crlv*Math.cos(phase)
+			q = crlv*Math.sin(phase)
+		
+			r = (y + 0.956*i + 0.621*q).to_i
+			g = (y - 0.272*i - 0.647*q).to_i
+			b = (y - 1.107*i + 1.704*q).to_i
+			
+			r=0 if r<0
+			g=0 if g<0
+			b=0 if b<0
+			r=255 if r>255
+			g=255 if g>255
+			b=255 if b>255
+			
+			
+#			puts "#{val},#{r},#{g},#{b}"
+			@palette[val]=PNG::Color.new(r,g,b,0xFF)
+		end
+	end
+	@palette
+end
+
 end  
 # == Author
 # Jonno Downes (jonno@jamtronix.com)