rpicsim 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d41b2c70c97b2d8129b34801fdd6344cc5b57c5
-  data.tar.gz: 2c54285f1ffcc4e4eb0ad19d0bda948641c2edc2
+  metadata.gz: 7942ae725016bb382c3214020eeaf8191e25b311
+  data.tar.gz: 9a5e4fb1eaac0ebd49b11b99618efa47cda520cc
 SHA512:
-  metadata.gz: 44351582e59474aec0fec8ffec411ba8dffe81e3d1c6003f79b180236fe86e2f92c8b82a22c00030e334fadd27f06686603daf302bc12ffefef9ac5dc667ea0f
-  data.tar.gz: 6f424c03cab34851a7943530f2c31c7014b47908713b5bb06f775452f6c28c75b10c0f892fda30d326d5cc2f746d9d4c6d9506da0a47e9fbbfcdb1056cfb7d97
+  metadata.gz: 1696c66457debd316648fd2f405c370d96f685d0d6297936b267d53acc463aa4a886847dee60ffa6fb70ec86833bc56f31941743f970577533d454e65d42af9a
+  data.tar.gz: 97c0223646863b0168099d59971e75a12e7cb448ae84b2acda6d96f4ecb710780a696c1ca03016475d92309348765beb9401ed66a501b3e6bebb4d92bd7b8af7

data/Gemfile

@@ -7,5 +7,5 @@ group :development do
   gem 'deg-yard'  # My little fork of the yard gem that has some bug fixes.
   gem 'guard'
   gem 'guard-rspec'
-  gem 'rubocop'
+  gem 'rubocop', '0.18.1'  # They made breaking changes in 0.19.x so let's not update yet.
 end

data/docs/ChangeLog.md

@@ -1,6 +1,12 @@
 Change log
 ====
 
+0.2.3
+----
+Released on 2014-03-17.
+
+- Fixed a bug preventing symbols in RAM generated by the XC8 compiler from being recognized.
+
 0.2.2
 ----
 Released on 2014-03-07.

data/lib/rpicsim/mplab/mplab_program_file.rb

@@ -18,28 +18,64 @@ module RPicSim::Mplab
 
     def symbols_in_ram
       @symbols_in_ram ||= Hash[
-        symbols.select { |s| s.m_lType == 0 }.map { |s| [s.m_Symbol.to_sym, s.address] }
+        grouped_symbols[:ram]
+          .map { |s| [s.m_Symbol.to_sym, s.address] }
       ]
     end
 
     def symbols_in_program_memory
       @symbols_in_code_space ||= Hash[
-        symbols
-          .select { |s| s.m_lType != 0 && !EepromRange.include?(s.address) }
+        grouped_symbols[:program_memory]
           .map { |s| [s.m_Symbol.to_sym, s.address] }
       ]
     end
 
     def symbols_in_eeprom
       @symbols_in_eeprom ||= Hash[
-        symbols
-          .select { |s| s.m_lType != 0 && EepromRange.include?(s.address) }
+        grouped_symbols[:eeprom]
           .map { |s| [s.m_Symbol.to_sym, s.address - EepromRange.min] }
       ]
     end
 
     private
 
+    def grouped_symbols
+      @grouped_symbols ||= begin
+        hash = symbols.group_by(&method(:memory_type))
+        hash.default = []
+        hash
+      end
+    end
+
+    # m_lType:  meaning:
+    # 0         MPASM RAM
+    # 12        XC8 RAM
+    # 22        MPASM program memory or EEPROM
+    # 14        XC8 program memory variable
+    # 65        XC8 program memory function
+
+    def memory_type(symbol)
+      case symbol.m_lType
+      when 0, 12
+        :ram
+      when 22
+        EepromRange.include?(symbol.address) ? :eeprom : :program_memory
+      when 12
+        :ram
+      when 14, 65
+        :program_memory
+      else
+        raise "Unknown m_lType #{symbol.m_lType} for symbol #{symbol.name}."
+      end
+    end
+
+    # Useful for debugging.
+    # Just put this line in your simulation class definition temporarily:
+    # pp program_file.instance_variable_get(:@mplab_program_file).send(:symbol_dump)
+    def symbol_dump
+      symbols.map { |s| [s.m_Symbol, s.m_lType, s.address, memory_type(s)] }
+    end
+
     def symbols
       @program_file.getSymbolTable.getSymbols(0, 0)
     end

data/lib/rpicsim/sim.rb

@@ -623,11 +623,11 @@ module RPicSim
       ram_var_names = self.class.variable_set.var_names_for_memory(:ram)
       @vars.values_at(*ram_var_names)
     end
-    
+
     def sfr_vars
       @sfrs.values
     end
-    
+
     def address_increment
       @assembly.device_info.code_address_increment
     end

data/lib/rpicsim/version.rb

@@ -1,3 +1,3 @@
 module RPicSim
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpicsim
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Pololu
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -16,11 +16,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
-- Gemfile
+- lib/rpicsim.rb
+- lib/rpicsim/call_stack_info.rb
+- lib/rpicsim/composite_memory.rb
+- lib/rpicsim/flaws.rb
+- lib/rpicsim/instruction.rb
+- lib/rpicsim/label.rb
+- lib/rpicsim/memory.rb
+- lib/rpicsim/memory_watcher.rb
+- lib/rpicsim/mplab.rb
+- lib/rpicsim/pin.rb
+- lib/rpicsim/program_counter.rb
+- lib/rpicsim/program_file.rb
+- lib/rpicsim/rspec.rb
+- lib/rpicsim/search.rb
+- lib/rpicsim/sim.rb
+- lib/rpicsim/stack_pointer.rb
+- lib/rpicsim/stack_trace.rb
+- lib/rpicsim/variable.rb
+- lib/rpicsim/variable_set.rb
+- lib/rpicsim/version.rb
+- lib/rpicsim/mplab/mplab_assembly.rb
+- lib/rpicsim/mplab/mplab_device_info.rb
+- lib/rpicsim/mplab/mplab_disassembler.rb
+- lib/rpicsim/mplab/mplab_instruction.rb
+- lib/rpicsim/mplab/mplab_loader.rb
+- lib/rpicsim/mplab/mplab_memory.rb
+- lib/rpicsim/mplab/mplab_nmmr_info.rb
+- lib/rpicsim/mplab/mplab_observer.rb
+- lib/rpicsim/mplab/mplab_pin.rb
+- lib/rpicsim/mplab/mplab_processor.rb
+- lib/rpicsim/mplab/mplab_program_file.rb
+- lib/rpicsim/mplab/mplab_register.rb
+- lib/rpicsim/mplab/mplab_sfr_info.rb
+- lib/rpicsim/mplab/mplab_simulator.rb
+- lib/rpicsim/rspec/be_predicate.rb
+- lib/rpicsim/rspec/helpers.rb
+- lib/rpicsim/rspec/persistent_expectations.rb
+- lib/rpicsim/rspec/sim_diagnostics.rb
+- lib/rpicsim/storage/memory_integer.rb
+- lib/rpicsim/storage/register.rb
 - Introduction.md
 - LICENSE.txt
 - README.md
+- Gemfile
 - docs/ChangeLog.md
 - docs/Contributing.md
 - docs/Debugging.md
@@ -39,8 +78,8 @@ files:
 - docs/Pins.md
 - docs/PreventingCallStackOverflow.md
 - docs/QuickStartGuide.md
-- docs/RSpecIntegration.md
 - docs/RamWatcher.md
+- docs/RSpecIntegration.md
 - docs/Running.md
 - docs/Stubbing.md
 - docs/SupportedCompilers.md
@@ -49,46 +88,7 @@ files:
 - docs/SupportedOperatingSystems.md
 - docs/UnitTesting.md
 - docs/Variables.md
-- lib/rpicsim.rb
-- lib/rpicsim/call_stack_info.rb
-- lib/rpicsim/composite_memory.rb
-- lib/rpicsim/flaws.rb
-- lib/rpicsim/instruction.rb
-- lib/rpicsim/label.rb
-- lib/rpicsim/memory.rb
-- lib/rpicsim/memory_watcher.rb
-- lib/rpicsim/mplab.rb
-- lib/rpicsim/mplab/mplab_assembly.rb
-- lib/rpicsim/mplab/mplab_device_info.rb
-- lib/rpicsim/mplab/mplab_disassembler.rb
-- lib/rpicsim/mplab/mplab_instruction.rb
-- lib/rpicsim/mplab/mplab_loader.rb
-- lib/rpicsim/mplab/mplab_memory.rb
-- lib/rpicsim/mplab/mplab_nmmr_info.rb
-- lib/rpicsim/mplab/mplab_observer.rb
-- lib/rpicsim/mplab/mplab_pin.rb
-- lib/rpicsim/mplab/mplab_processor.rb
-- lib/rpicsim/mplab/mplab_program_file.rb
-- lib/rpicsim/mplab/mplab_register.rb
-- lib/rpicsim/mplab/mplab_sfr_info.rb
-- lib/rpicsim/mplab/mplab_simulator.rb
-- lib/rpicsim/pin.rb
-- lib/rpicsim/program_counter.rb
-- lib/rpicsim/program_file.rb
-- lib/rpicsim/rspec.rb
-- lib/rpicsim/rspec/be_predicate.rb
-- lib/rpicsim/rspec/helpers.rb
-- lib/rpicsim/rspec/persistent_expectations.rb
-- lib/rpicsim/rspec/sim_diagnostics.rb
-- lib/rpicsim/search.rb
-- lib/rpicsim/sim.rb
-- lib/rpicsim/stack_pointer.rb
-- lib/rpicsim/stack_trace.rb
-- lib/rpicsim/storage/memory_integer.rb
-- lib/rpicsim/storage/register.rb
-- lib/rpicsim/variable.rb
-- lib/rpicsim/variable_set.rb
-- lib/rpicsim/version.rb
+- .yardopts
 homepage: https://github.com/pololu/rpicsim
 licenses:
 - MIT
@@ -111,7 +111,7 @@ requirements:
 - JRuby
 - MPLAB X
 rubyforge_project:
-rubygems_version: 2.2.1
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: RPicSim provides an interface to the MPLAB X PIC simulator that allows you to write simulator-based automated tests of PIC firmware with Ruby and RSpec.