CRC.crc32_from_address

Author: hasumikin

mrbgems/picoruby-crc/sig/crc.rbs

@@ -1,3 +1,4 @@
 module CRC
   def self.crc32: (?String string, ?Integer crc) -> Integer
+  def self.crc32_from_address: (Integer address, Integer length, ?Integer crc) -> Integer
 end

mrbgems/picoruby-crc/src/mruby/crc.c

@@ -20,12 +20,31 @@ mrb_crc_s_crc32(mrb_state *mrb, mrb_value klass)
   return mrb_int_value(mrb, crc_value);
 }
 
+/*
+ * CRC.crc32_from_address(address, length, crc = nil) -> Integer
+ */
+static mrb_value
+mrb_crc_s_crc32_from_address(mrb_state *mrb, mrb_value klass)
+{
+  mrb_int address;
+  mrb_int length;
+  mrb_int crc = 0;
+  mrb_get_args(mrb, "ii|i", &address, &length, &crc);
+  if (address == 0) {
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "Address must not be NULL");
+  }
+  uint32_t crc_value = generate_crc32((uint8_t *)((uintptr_t)address), (size_t)length, (uint32_t)crc);
+  return mrb_int_value(mrb, crc_value);
+}
+
+
 void
 mrb_picoruby_crc_gem_init(mrb_state* mrb)
 {
   struct RClass *module_CRC = mrb_define_module_id(mrb, MRB_SYM(CRC));
 
   mrb_define_class_method_id(mrb, module_CRC, MRB_SYM(crc32), mrb_crc_s_crc32, MRB_ARGS_OPT(2));
+  mrb_define_class_method_id(mrb, module_CRC, MRB_SYM(crc32_from_address), mrb_crc_s_crc32_from_address, MRB_ARGS_ARG(2,1));
 }
 
 void

mrbgems/picoruby-crc/src/mrubyc/crc.c

@@ -18,17 +18,40 @@ c_crc_crc32(mrbc_vm *vm, mrbc_value v[], int argc)
     SET_INT_RETURN(0);
     return;
   } else if (string.tt != MRBC_TT_STRING) {
-    mrbc_raise(vm, MRBC_CLASS(TypeError), "string expected");
+    mrbc_raise(vm, MRBC_CLASS(TypeError), "Expected a String type for the first argument");
     return;
   }
   uint32_t crc_value = generate_crc32((uint8_t *)string.string->data, (size_t)string.string->size, (uint32_t)crc);
   SET_INT_RETURN(crc_value);
 }
 
+/*
+ * CRC.crc32_from_address(address, length, crc = nil) -> Integer
+ */
+static void
+c_crc_crc32_from_address(mrbc_vm *vm, mrbc_value v[], int argc)
+{
+  uintptr_t address = (uintptr_t)GET_INT_ARG(1);
+  if (address == 0) {
+    mrbc_raise(vm, MRBC_CLASS(ArgumentError), "Address must not be NULL");
+    return;
+  }
+  mrbc_int_t length = GET_INT_ARG(2);
+  mrbc_int_t crc;
+  if (argc < 3) {
+    crc = 0;
+  } else {
+    crc = GET_INT_ARG(3);
+  }
+  uint32_t crc_value = generate_crc32((uint8_t *)address, (size_t)length, (uint32_t)crc);
+  SET_INT_RETURN(crc_value);
+}
+
 void
 mrbc_crc_init(mrbc_vm *vm)
 {
   mrbc_class *module_CRC = mrbc_define_module(vm, "CRC");
 
   mrbc_define_method(vm, module_CRC, "crc32", c_crc_crc32);
+  mrbc_define_method(vm, module_CRC, "crc32_from_address", c_crc_crc32_from_address);
 }

mrbgems/picoruby-shell/mrblib/shell.rb

@@ -40,25 +40,28 @@ def self.ensure_system_file(path, code, crc = nil)
         print "Checking: #{path}"
         File.open(path, "r") do |f|
           actual_len = f.size
-          actual_code = f.read if 0 < actual_len
-          sleep_ms 100
-          actual_crc = CRC.crc32(actual_code)
+          actual_crc = if f.respond_to?(:physical_address)
+                         CRC.crc32_from_address(f.physical_address, code.size)
+                       else
+                         actual_code = f.read if 0 < actual_len
+                         CRC.crc32(actual_code)
+                       end
           if (actual_len == code.length) && ( crc.nil? || (actual_crc == crc) )
             puts " ... OK (#{code.length} bytes)"
             return
           else
-            puts " ... NG. Updating... (len: #{code.size}<=>#{actual_len} crc: #{crc}<=>#{actual_crc})"
+            puts " ... NG! (len: #{code.size}<=>#{actual_len} crc: #{crc}<=>#{actual_crc})"
           end
         end
         File.unlink(path)
         sleep_ms 100
       else
         File.open(path, "w") do |f|
-          puts "Creating: #{path}"
+          puts " Writing: #{path}"
           f.expand(code.length) if f.respond_to?(:expand)
           f.write(code)
         end
-        sleep_ms 10
+        sleep_ms 100
       end
     end
     File.unlink(path) if File.file?(path)

mrbgems/picoruby-shell/sig/shell.rbs

@@ -25,8 +25,8 @@ class Shell
   def self.setup_sdcard: (SPI spi) -> void
 
   def self.setup_root_volume: (Symbol drive, ?label: String) -> void
-  def self.ensure_system_file: (String path, String code, Integer | nil crc) -> void
-  def self.setup_system_files: (?(String | nil) root) -> void
+  def self.ensure_system_file: (String path, String code, ?(Integer | nil) crc) -> void
+  def self.setup_system_files: (?(String | nil) root, ?force: bool) -> void
   def self.bootstrap: (String file) -> bool
 
   def initialize: (?clean: bool) -> void