Mercurial > hg > Members > tobaru > CbC_xv6

changeset 131:c690327cabc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
using dg file
author anatofuz
date Wed, 04 Dec 2019 20:44:29 +0900
parents 3312d7ce91e6
children 8e93917ce4be
files src/gearsTools/lib/Gears/Context.pm src/interface/SysRead.h src/interface/file.dg
diffstat 3 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/gearsTools/lib/Gears/Context.pm	Tue Dec 03 14:58:00 2019 +0900
+++ b/src/gearsTools/lib/Gears/Context.pm	Wed Dec 04 20:44:29 2019 +0900
@@ -30,7 +30,7 @@
   for my $cbc_file (@{$self->{compile_sources}}) {
     open my $fh , '<', $cbc_file;
     while (my $line = <$fh>) {
-       if ($line =~ /#interface\s*"(.*)\.h"/ || $line =~ /^\/\/\s*use\s*"(.*)\.h"/) {
+       if ($line =~ /#interface\s*"(.*)\.h"/ || $line =~ /^\/\/\s*data_gear\s*"(.*)\.(?:h|dg)?"/) {
           $self->{data_gears_with_count}->{$1}->{caller}->{$cbc_file}++;
           $counter{interfaces}->{$1}++;
           next;
@@ -207,7 +207,7 @@
 
   my $header_paths = Gears::Util->find_headers_path($search_bash_path);
   map {
-    if (/(\w+)\.h/) {
+    if (/(\w+)\.(?:h|dg)/) {
         my $header_file = $1;
         if (exists $res{$header_file}) {
           if ($res{$header_file} =~ /^\d+$/){
--- a/src/interface/SysRead.h	Tue Dec 03 14:58:00 2019 +0900
+++ b/src/interface/SysRead.h	Wed Dec 04 20:44:29 2019 +0900
@@ -1,7 +1,8 @@
 typedef struct SysRead<Type, Impl>{
    union  Data* sys_read;
    int num;
-   char* str;
+   char* addr;
+   struct file* file;
    __code read(Impl* sys_read, __code next(...));
    //__code ret(Impl* cbc_sys_file, UInteger* num);
    __code next(...);
--- a/src/interface/file.dg	Tue Dec 03 14:58:00 2019 +0900
+++ b/src/interface/file.dg	Wed Dec 04 20:44:29 2019 +0900
@@ -5,5 +5,5 @@
     char         writable;
     struct pipe  *pipe;
     struct inode *ip;
-    uint         off;
+    unsigned int off;
 } file;