Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
677a2ac2
Commit
677a2ac2
authored
Nov 07, 2013
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
irep->pool not to be GCed
parent
e92d4e26
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
87 additions
and
113 deletions
+87
-113
include/mruby/irep.h
include/mruby/irep.h
+11
-1
src/codegen.c
src/codegen.c
+44
-17
src/dump.c
src/dump.c
+10
-12
src/gc.c
src/gc.c
+1
-46
src/load.c
src/load.c
+8
-5
src/state.c
src/state.c
+6
-0
src/string.c
src/string.c
+0
-28
src/vm.c
src/vm.c
+7
-4
No files found.
include/mruby/irep.h
View file @
677a2ac2
...
@@ -18,7 +18,17 @@ typedef struct mrb_irep {
...
@@ -18,7 +18,17 @@ typedef struct mrb_irep {
uint8_t
flags
;
uint8_t
flags
;
mrb_code
*
iseq
;
mrb_code
*
iseq
;
mrb_value
*
pool
;
struct
irep_pool
{
union
{
mrb_float
f
;
struct
irep_pool_string
{
mrb_int
len
;
char
buf
[
1
];
}
*
s
;
mrb_int
i
;
}
value
;
enum
mrb_vtype
type
;
}
*
pool
;
mrb_sym
*
syms
;
mrb_sym
*
syms
;
struct
mrb_irep
**
reps
;
struct
mrb_irep
**
reps
;
...
...
src/codegen.c
View file @
677a2ac2
...
@@ -316,8 +316,8 @@ genop_peep(codegen_scope *s, mrb_code i, int val)
...
@@ -316,8 +316,8 @@ genop_peep(codegen_scope *s, mrb_code i, int val)
if
(
c0
==
OP_STRING
)
{
if
(
c0
==
OP_STRING
)
{
int
i
=
GETARG_Bx
(
i0
);
int
i
=
GETARG_Bx
(
i0
);
if
(
mrb_type
(
s
->
irep
->
pool
[
i
])
==
MRB_TT_STRING
&&
if
(
s
->
irep
->
pool
[
i
].
type
==
MRB_TT_STRING
&&
RSTRING_LEN
(
s
->
irep
->
pool
[
i
])
==
0
)
{
s
->
irep
->
pool
[
i
].
value
.
s
->
len
==
0
)
{
s
->
pc
--
;
s
->
pc
--
;
return
;
return
;
}
}
...
@@ -397,34 +397,62 @@ static inline int
...
@@ -397,34 +397,62 @@ static inline int
new_lit
(
codegen_scope
*
s
,
mrb_value
val
)
new_lit
(
codegen_scope
*
s
,
mrb_value
val
)
{
{
size_t
i
;
size_t
i
;
struct
irep_pool
*
pv
;
switch
(
mrb_type
(
val
))
{
switch
(
mrb_type
(
val
))
{
case
MRB_TT_STRING
:
case
MRB_TT_STRING
:
for
(
i
=
0
;
i
<
s
->
irep
->
plen
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
irep
->
plen
;
i
++
)
{
mrb_value
pv
=
s
->
irep
->
pool
[
i
];
pv
=
&
s
->
irep
->
pool
[
i
];
mrb_int
len
;
mrb_int
len
;
if
(
mrb_type
(
pv
)
!=
MRB_TT_STRING
)
continue
;
if
(
pv
->
type
!=
MRB_TT_STRING
)
continue
;
if
((
len
=
RSTRING_LEN
(
pv
)
)
!=
RSTRING_LEN
(
val
))
continue
;
if
((
len
=
pv
->
value
.
s
->
len
)
!=
RSTRING_LEN
(
val
))
continue
;
if
(
memcmp
(
RSTRING_PTR
(
pv
)
,
RSTRING_PTR
(
val
),
len
)
==
0
)
if
(
memcmp
(
pv
->
value
.
s
->
buf
,
RSTRING_PTR
(
val
),
len
)
==
0
)
return
i
;
return
i
;
}
}
break
;
break
;
case
MRB_TT_FLOAT
:
case
MRB_TT_FLOAT
:
default:
for
(
i
=
0
;
i
<
s
->
irep
->
plen
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
irep
->
plen
;
i
++
)
{
if
(
mrb_obj_equal
(
s
->
mrb
,
s
->
irep
->
pool
[
i
],
val
))
return
i
;
pv
=
&
s
->
irep
->
pool
[
i
];
if
(
pv
->
value
.
f
==
mrb_float
(
val
))
return
i
;
}
}
break
;
break
;
case
MRB_TT_FIXNUM
:
for
(
i
=
0
;
i
<
s
->
irep
->
plen
;
i
++
)
{
pv
=
&
s
->
irep
->
pool
[
i
];
if
(
pv
->
value
.
i
==
mrb_fixnum
(
val
))
return
i
;
}
break
;
default:
/* should not happen */
return
0
;
}
}
if
(
s
->
irep
->
plen
==
s
->
pcapa
)
{
if
(
s
->
irep
->
plen
==
s
->
pcapa
)
{
s
->
pcapa
*=
2
;
s
->
pcapa
*=
2
;
s
->
irep
->
pool
=
(
mrb_value
*
)
codegen_realloc
(
s
,
s
->
irep
->
pool
,
sizeof
(
mrb_value
)
*
s
->
pcapa
);
s
->
irep
->
pool
=
(
struct
irep_pool
*
)
codegen_realloc
(
s
,
s
->
irep
->
pool
,
sizeof
(
struct
irep_pool
)
*
s
->
pcapa
);
}
}
s
->
irep
->
pool
[
s
->
irep
->
plen
]
=
val
;
pv
=
&
s
->
irep
->
pool
[
s
->
irep
->
plen
];
i
=
s
->
irep
->
plen
++
;
i
=
s
->
irep
->
plen
++
;
pv
->
type
=
mrb_type
(
val
);
switch
(
pv
->
type
)
{
case
MRB_TT_STRING
:
pv
->
value
.
s
=
(
struct
irep_pool_string
*
)
codegen_malloc
(
s
,
sizeof
(
struct
irep_pool_string
)
+
RSTRING_LEN
(
val
));
pv
->
value
.
s
->
len
=
RSTRING_LEN
(
val
);
memcpy
(
pv
->
value
.
s
->
buf
,
RSTRING_PTR
(
val
),
RSTRING_LEN
(
val
));
break
;
case
MRB_TT_FLOAT
:
pv
->
value
.
f
=
mrb_float
(
val
);
break
;
case
MRB_TT_FIXNUM
:
pv
->
value
.
i
=
mrb_fixnum
(
val
);
break
;
default:
/* should not happen */
break
;
}
return
i
;
return
i
;
}
}
...
@@ -2382,7 +2410,7 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *lv)
...
@@ -2382,7 +2410,7 @@ scope_new(mrb_state *mrb, codegen_scope *prev, node *lv)
p
->
iseq
=
(
mrb_code
*
)
mrb_malloc
(
mrb
,
sizeof
(
mrb_code
)
*
p
->
icapa
);
p
->
iseq
=
(
mrb_code
*
)
mrb_malloc
(
mrb
,
sizeof
(
mrb_code
)
*
p
->
icapa
);
p
->
pcapa
=
32
;
p
->
pcapa
=
32
;
p
->
irep
->
pool
=
(
mrb_value
*
)
mrb_malloc
(
mrb
,
sizeof
(
mrb_value
)
*
p
->
pcapa
);
p
->
irep
->
pool
=
(
struct
irep_pool
*
)
mrb_malloc
(
mrb
,
sizeof
(
struct
irep_pool
)
*
p
->
pcapa
);
p
->
irep
->
plen
=
0
;
p
->
irep
->
plen
=
0
;
p
->
scapa
=
256
;
p
->
scapa
=
256
;
...
@@ -2435,9 +2463,9 @@ scope_finish(codegen_scope *s)
...
@@ -2435,9 +2463,9 @@ scope_finish(codegen_scope *s)
irep
->
lines
=
0
;
irep
->
lines
=
0
;
}
}
}
}
irep
->
pool
=
(
mrb_value
*
)
codegen_realloc
(
s
,
irep
->
pool
,
sizeof
(
mrb_value
)
*
irep
->
plen
);
irep
->
pool
=
(
struct
irep_pool
*
)
codegen_realloc
(
s
,
irep
->
pool
,
sizeof
(
struct
irep_pool
)
*
irep
->
plen
);
irep
->
syms
=
(
mrb_sym
*
)
codegen_realloc
(
s
,
irep
->
syms
,
sizeof
(
mrb_sym
)
*
irep
->
slen
);
irep
->
syms
=
(
mrb_sym
*
)
codegen_realloc
(
s
,
irep
->
syms
,
sizeof
(
mrb_sym
)
*
irep
->
slen
);
irep
->
reps
=
(
mrb_irep
**
)
codegen_realloc
(
s
,
irep
->
reps
,
sizeof
(
mrb_irep
*
)
*
irep
->
rlen
);
irep
->
reps
=
(
mrb_irep
**
)
codegen_realloc
(
s
,
irep
->
reps
,
sizeof
(
mrb_irep
*
)
*
irep
->
rlen
);
if
(
s
->
filename
)
{
if
(
s
->
filename
)
{
s
->
irep
->
filename
=
mrb_parser_get_filename
(
s
->
parser
,
s
->
filename_index
);
s
->
irep
->
filename
=
mrb_parser_get_filename
(
s
->
parser
,
s
->
filename_index
);
mrb_debug_info_append_file
(
mrb
,
s
->
irep
,
s
->
debug_start_pos
,
s
->
pc
);
mrb_debug_info_append_file
(
mrb
,
s
->
irep
,
s
->
debug_start_pos
,
s
->
pc
);
...
@@ -2777,9 +2805,8 @@ codedump(mrb_state *mrb, mrb_irep *irep)
...
@@ -2777,9 +2805,8 @@ codedump(mrb_state *mrb, mrb_irep *irep)
break
;
break
;
case
OP_STRING
:
case
OP_STRING
:
{
{
mrb_value
s
=
irep
->
pool
[
GETARG_Bx
(
c
)];
struct
irep_pool
*
pv
=
&
irep
->
pool
[
GETARG_Bx
(
c
)];
mrb_value
s
=
mrb_str_dump
(
mrb
,
mrb_str_new
(
mrb
,
pv
->
value
.
s
->
buf
,
pv
->
value
.
s
->
len
));
s
=
mrb_str_dump
(
mrb
,
s
);
printf
(
"OP_STRING
\t
R%d
\t
%s
\n
"
,
GETARG_A
(
c
),
RSTRING_PTR
(
s
));
printf
(
"OP_STRING
\t
R%d
\t
%s
\n
"
,
GETARG_A
(
c
),
RSTRING_PTR
(
s
));
}
}
break
;
break
;
...
...
src/dump.c
View file @
677a2ac2
...
@@ -79,20 +79,19 @@ get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
...
@@ -79,20 +79,19 @@ get_pool_block_size(mrb_state *mrb, mrb_irep *irep)
for
(
pool_no
=
0
;
pool_no
<
irep
->
plen
;
pool_no
++
)
{
for
(
pool_no
=
0
;
pool_no
<
irep
->
plen
;
pool_no
++
)
{
int
ai
=
mrb_gc_arena_save
(
mrb
);
int
ai
=
mrb_gc_arena_save
(
mrb
);
switch
(
mrb_type
(
irep
->
pool
[
pool_no
])
)
{
switch
(
irep
->
pool
[
pool_no
].
type
)
{
case
MRB_TT_FIXNUM
:
case
MRB_TT_FIXNUM
:
str
=
mrb_fixnum_to_str
(
mrb
,
irep
->
pool
[
pool_no
]
,
10
);
str
=
mrb_fixnum_to_str
(
mrb
,
mrb_fixnum_value
(
irep
->
pool
[
pool_no
].
value
.
i
)
,
10
);
size
+=
RSTRING_LEN
(
str
);
size
+=
RSTRING_LEN
(
str
);
break
;
break
;
case
MRB_TT_FLOAT
:
case
MRB_TT_FLOAT
:
len
=
mrb_float_to_str
(
buf
,
mrb_float
(
irep
->
pool
[
pool_no
])
);
len
=
mrb_float_to_str
(
buf
,
irep
->
pool
[
pool_no
].
value
.
f
);
size
+=
len
;
size
+=
len
;
break
;
break
;
case
MRB_TT_STRING
:
case
MRB_TT_STRING
:
str
=
mrb_str_to_str
(
mrb
,
irep
->
pool
[
pool_no
]);
size
+=
irep
->
pool
[
pool_no
].
value
.
s
->
len
;
size
+=
RSTRING_LEN
(
str
);
break
;
break
;
default:
default:
...
@@ -120,24 +119,23 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
...
@@ -120,24 +119,23 @@ write_pool_block(mrb_state *mrb, mrb_irep *irep, uint8_t *buf)
for
(
pool_no
=
0
;
pool_no
<
irep
->
plen
;
pool_no
++
)
{
for
(
pool_no
=
0
;
pool_no
<
irep
->
plen
;
pool_no
++
)
{
int
ai
=
mrb_gc_arena_save
(
mrb
);
int
ai
=
mrb_gc_arena_save
(
mrb
);
cur
+=
uint8_to_bin
(
mrb_type
(
irep
->
pool
[
pool_no
])
,
cur
);
/* data type */
cur
+=
uint8_to_bin
(
irep
->
pool
[
pool_no
].
type
,
cur
);
/* data type */
switch
(
mrb_type
(
irep
->
pool
[
pool_no
])
)
{
switch
(
irep
->
pool
[
pool_no
].
type
)
{
case
MRB_TT_FIXNUM
:
case
MRB_TT_FIXNUM
:
str
=
mrb_fixnum_to_str
(
mrb
,
irep
->
pool
[
pool_no
]
,
10
);
str
=
mrb_fixnum_to_str
(
mrb
,
mrb_fixnum_value
(
irep
->
pool
[
pool_no
].
value
.
i
)
,
10
);
char_ptr
=
RSTRING_PTR
(
str
);
char_ptr
=
RSTRING_PTR
(
str
);
len
=
RSTRING_LEN
(
str
);
len
=
RSTRING_LEN
(
str
);
break
;
break
;
case
MRB_TT_FLOAT
:
case
MRB_TT_FLOAT
:
len
=
mrb_float_to_str
(
char_buf
,
mrb_float
(
irep
->
pool
[
pool_no
])
);
len
=
mrb_float_to_str
(
char_buf
,
irep
->
pool
[
pool_no
].
value
.
f
);
char_ptr
=
&
char_buf
[
0
];
char_ptr
=
&
char_buf
[
0
];
break
;
break
;
case
MRB_TT_STRING
:
case
MRB_TT_STRING
:
str
=
irep
->
pool
[
pool_no
];
char_ptr
=
irep
->
pool
[
pool_no
].
value
.
s
->
buf
;
char_ptr
=
RSTRING_PTR
(
str
);
len
=
irep
->
pool
[
pool_no
].
value
.
s
->
len
;
len
=
RSTRING_LEN
(
str
);
break
;
break
;
default:
default:
...
...
src/gc.c
View file @
677a2ac2
...
@@ -470,31 +470,6 @@ mark_context(mrb_state *mrb, struct mrb_context *c)
...
@@ -470,31 +470,6 @@ mark_context(mrb_state *mrb, struct mrb_context *c)
}
}
}
}
static
size_t
mark_irep_pool_size
(
mrb_state
*
mrb
,
mrb_irep
*
irep
)
{
size_t
size
=
irep
->
plen
;
size_t
i
;
for
(
i
=
0
;
i
<
irep
->
rlen
;
i
++
)
{
size
+=
mark_irep_pool_size
(
mrb
,
irep
->
reps
[
i
]);
}
return
size
;
}
static
void
mark_irep_pool
(
mrb_state
*
mrb
,
mrb_irep
*
irep
)
{
size_t
i
;
for
(
i
=
0
;
i
<
irep
->
plen
;
i
++
)
{
mrb_gc_mark_value
(
mrb
,
irep
->
pool
[
i
]);
}
for
(
i
=
0
;
i
<
irep
->
rlen
;
i
++
)
{
mark_irep_pool
(
mrb
,
irep
->
reps
[
i
]);
}
}
static
void
static
void
gc_mark_children
(
mrb_state
*
mrb
,
struct
RBasic
*
obj
)
gc_mark_children
(
mrb_state
*
mrb
,
struct
RBasic
*
obj
)
{
{
...
@@ -529,9 +504,6 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
...
@@ -529,9 +504,6 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj)
mrb_gc_mark
(
mrb
,
(
struct
RBasic
*
)
p
->
env
);
mrb_gc_mark
(
mrb
,
(
struct
RBasic
*
)
p
->
env
);
mrb_gc_mark
(
mrb
,
(
struct
RBasic
*
)
p
->
target_class
);
mrb_gc_mark
(
mrb
,
(
struct
RBasic
*
)
p
->
target_class
);
if
(
!
MRB_PROC_CFUNC_P
(
p
))
{
mark_irep_pool
(
mrb
,
p
->
body
.
irep
);
}
}
}
break
;
break
;
...
@@ -691,7 +663,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
...
@@ -691,7 +663,7 @@ obj_free(mrb_state *mrb, struct RBasic *obj)
static
void
static
void
root_scan_phase
(
mrb_state
*
mrb
)
root_scan_phase
(
mrb_state
*
mrb
)
{
{
size_t
i
,
e
,
j
;
size_t
i
,
e
;
if
(
!
is_minor_gc
(
mrb
))
{
if
(
!
is_minor_gc
(
mrb
))
{
mrb
->
gray_list
=
NULL
;
mrb
->
gray_list
=
NULL
;
...
@@ -714,19 +686,6 @@ root_scan_phase(mrb_state *mrb)
...
@@ -714,19 +686,6 @@ root_scan_phase(mrb_state *mrb)
if
(
mrb
->
root_c
!=
mrb
->
c
)
{
if
(
mrb
->
root_c
!=
mrb
->
c
)
{
mark_context
(
mrb
,
mrb
->
c
);
mark_context
(
mrb
,
mrb
->
c
);
}
}
/* mark irep pool */
if
(
mrb
->
irep
)
{
size_t
len
=
mrb
->
irep_len
;
if
(
len
>
mrb
->
irep_capa
)
len
=
mrb
->
irep_capa
;
for
(
i
=
0
;
i
<
len
;
i
++
)
{
mrb_irep
*
irep
=
mrb
->
irep
[
i
];
if
(
!
irep
)
continue
;
for
(
j
=
0
;
j
<
irep
->
plen
;
j
++
)
{
mrb_gc_mark_value
(
mrb
,
irep
->
pool
[
j
]);
}
}
}
}
}
static
size_t
static
size_t
...
@@ -799,10 +758,6 @@ gc_gray_mark(mrb_state *mrb, struct RBasic *obj)
...
@@ -799,10 +758,6 @@ gc_gray_mark(mrb_state *mrb, struct RBasic *obj)
break
;
break
;
case
MRB_TT_PROC
:
case
MRB_TT_PROC
:
if
(
!
MRB_PROC_CFUNC_P
((
struct
RProc
*
)
obj
))
{
children
+=
mark_irep_pool_size
(
mrb
,
((
struct
RProc
*
)
obj
)
->
body
.
irep
);
}
/* fall through */
case
MRB_TT_RANGE
:
case
MRB_TT_RANGE
:
children
+=
2
;
children
+=
2
;
break
;
break
;
...
...
src/load.c
View file @
677a2ac2
...
@@ -87,7 +87,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, uint32_t *len)
...
@@ -87,7 +87,7 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, uint32_t *len)
if
(
SIZE_ERROR_MUL
(
sizeof
(
mrb_value
),
plen
))
{
if
(
SIZE_ERROR_MUL
(
sizeof
(
mrb_value
),
plen
))
{
return
NULL
;
return
NULL
;
}
}
irep
->
pool
=
(
mrb_value
*
)
mrb_malloc
(
mrb
,
sizeof
(
mrb_value
)
*
plen
);
irep
->
pool
=
(
struct
irep_pool
*
)
mrb_malloc
(
mrb
,
sizeof
(
struct
irep_pool
)
*
plen
);
if
(
irep
->
pool
==
NULL
)
{
if
(
irep
->
pool
==
NULL
)
{
return
NULL
;
return
NULL
;
}
}
...
@@ -99,21 +99,24 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, uint32_t *len)
...
@@ -99,21 +99,24 @@ read_irep_record_1(mrb_state *mrb, const uint8_t *bin, uint32_t *len)
src
+=
sizeof
(
uint16_t
);
src
+=
sizeof
(
uint16_t
);
s
=
mrb_str_new
(
mrb
,
(
char
*
)
src
,
pool_data_len
);
s
=
mrb_str_new
(
mrb
,
(
char
*
)
src
,
pool_data_len
);
src
+=
pool_data_len
;
src
+=
pool_data_len
;
irep
->
pool
[
i
].
type
=
tt
;
switch
(
tt
)
{
//pool data
switch
(
tt
)
{
//pool data
case
MRB_TT_FIXNUM
:
case
MRB_TT_FIXNUM
:
irep
->
pool
[
i
]
=
mrb_str_to_inum
(
mrb
,
s
,
10
,
FALSE
);
irep
->
pool
[
i
]
.
value
.
i
=
mrb_fixnum
(
mrb_str_to_inum
(
mrb
,
s
,
10
,
FALSE
)
);
break
;
break
;
case
MRB_TT_FLOAT
:
case
MRB_TT_FLOAT
:
irep
->
pool
[
i
]
=
mrb_float_value
(
mrb
,
mrb_str_to_dbl
(
mrb
,
s
,
FALSE
)
);
irep
->
pool
[
i
]
.
value
.
f
=
mrb_str_to_dbl
(
mrb
,
s
,
FALSE
);
break
;
break
;
case
MRB_TT_STRING
:
case
MRB_TT_STRING
:
irep
->
pool
[
i
]
=
s
;
irep
->
pool
[
i
].
value
.
s
=
(
struct
irep_pool_string
*
)
mrb_malloc
(
mrb
,
sizeof
(
struct
irep_pool_string
)
+
pool_data_len
);
irep
->
pool
[
i
].
value
.
s
->
len
=
pool_data_len
;
memcpy
(
irep
->
pool
[
i
].
value
.
s
->
buf
,
src
-
pool_data_len
,
pool_data_len
);
break
;
break
;
default:
default:
irep
->
pool
[
i
]
=
mrb_nil_value
();
/* should not happen */
break
;
break
;
}
}
irep
->
plen
++
;
irep
->
plen
++
;
...
...
src/state.c
View file @
677a2ac2
...
@@ -109,8 +109,14 @@ void mrb_free_heap(mrb_state *mrb);
...
@@ -109,8 +109,14 @@ void mrb_free_heap(mrb_state *mrb);
void
void
mrb_irep_free
(
mrb_state
*
mrb
,
mrb_irep
*
irep
)
mrb_irep_free
(
mrb_state
*
mrb
,
mrb_irep
*
irep
)
{
{
size_t
i
;
if
(
!
(
irep
->
flags
&
MRB_ISEQ_NO_FREE
))
if
(
!
(
irep
->
flags
&
MRB_ISEQ_NO_FREE
))
mrb_free
(
mrb
,
irep
->
iseq
);
mrb_free
(
mrb
,
irep
->
iseq
);
for
(
i
=
0
;
i
<
irep
->
plen
;
i
++
)
{
if
(
irep
->
pool
[
i
].
type
==
MRB_TT_STRING
)
mrb_free
(
mrb
,
irep
->
pool
[
i
].
value
.
s
);
}
mrb_free
(
mrb
,
irep
->
pool
);
mrb_free
(
mrb
,
irep
->
pool
);
mrb_free
(
mrb
,
irep
->
syms
);
mrb_free
(
mrb
,
irep
->
syms
);
mrb_free
(
mrb
,
(
void
*
)
irep
->
filename
);
mrb_free
(
mrb
,
(
void
*
)
irep
->
filename
);
...
...
src/string.c
View file @
677a2ac2
...
@@ -331,34 +331,6 @@ str_make_shared(mrb_state *mrb, struct RString *s)
...
@@ -331,34 +331,6 @@ str_make_shared(mrb_state *mrb, struct RString *s)
}
}
}
}
/*
* call-seq: (Caution! string literal)
* String.new(str="") => new_str
*
* Returns a new string object containing a copy of <i>str</i>.
*/
mrb_value
mrb_str_literal
(
mrb_state
*
mrb
,
mrb_value
str
)
{
struct
RString
*
s
,
*
orig
;
mrb_shared_string
*
shared
;
s
=
mrb_obj_alloc_string
(
mrb
);
orig
=
mrb_str_ptr
(
str
);
if
(
!
(
orig
->
flags
&
MRB_STR_SHARED
))
{
str_make_shared
(
mrb
,
orig
);
}
shared
=
orig
->
aux
.
shared
;
shared
->
refcnt
++
;
s
->
ptr
=
shared
->
ptr
;
s
->
len
=
shared
->
len
;
s
->
aux
.
shared
=
shared
;
s
->
flags
|=
MRB_STR_SHARED
;
return
mrb_obj_value
(
s
);
}
/*
/*
* call-seq:
* call-seq:
* char* str = String("abcd"), len=strlen("abcd")
* char* str = String("abcd"), len=strlen("abcd")
...
...
src/vm.c
View file @
677a2ac2
...
@@ -552,7 +552,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
...
@@ -552,7 +552,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
/* mrb_assert(mrb_proc_cfunc_p(proc)) */
/* mrb_assert(mrb_proc_cfunc_p(proc)) */
mrb_irep
*
irep
=
proc
->
body
.
irep
;
mrb_irep
*
irep
=
proc
->
body
.
irep
;
mrb_code
*
pc
=
irep
->
iseq
;
mrb_code
*
pc
=
irep
->
iseq
;
mrb_value
*
pool
=
irep
->
pool
;
struct
irep_pool
*
pool
=
irep
->
pool
;
mrb_sym
*
syms
=
irep
->
syms
;
mrb_sym
*
syms
=
irep
->
syms
;
mrb_value
*
regs
=
NULL
;
mrb_value
*
regs
=
NULL
;
mrb_code
i
;
mrb_code
i
;
...
@@ -616,7 +616,10 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
...
@@ -616,7 +616,10 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
CASE
(
OP_LOADL
)
{
CASE
(
OP_LOADL
)
{
/* A Bx R(A) := Pool(Bx) */
/* A Bx R(A) := Pool(Bx) */
regs
[
GETARG_A
(
i
)]
=
pool
[
GETARG_Bx
(
i
)];
if
(
pool
[
GETARG_Bx
(
i
)].
type
==
MRB_TT_FLOAT
)
SET_FLT_VALUE
(
mrb
,
regs
[
GETARG_A
(
i
)],
pool
[
GETARG_Bx
(
i
)].
value
.
f
);
else
SET_INT_VALUE
(
regs
[
GETARG_A
(
i
)],
pool
[
GETARG_Bx
(
i
)].
value
.
i
);
NEXT
;
NEXT
;
}
}
...
@@ -1934,7 +1937,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
...
@@ -1934,7 +1937,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
CASE
(
OP_STRING
)
{
CASE
(
OP_STRING
)
{
/* A Bx R(A) := str_new(Lit(Bx)) */
/* A Bx R(A) := str_new(Lit(Bx)) */
regs
[
GETARG_A
(
i
)]
=
mrb_str_
literal
(
mrb
,
pool
[
GETARG_Bx
(
i
)]
);
regs
[
GETARG_A
(
i
)]
=
mrb_str_
new
(
mrb
,
pool
[
GETARG_Bx
(
i
)].
value
.
s
->
buf
,
pool
[
GETARG_Bx
(
i
)].
value
.
s
->
len
);
mrb_gc_arena_restore
(
mrb
,
ai
);
mrb_gc_arena_restore
(
mrb
,
ai
);
NEXT
;
NEXT
;
}
}
...
@@ -2129,7 +2132,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
...
@@ -2129,7 +2132,7 @@ mrb_context_run(mrb_state *mrb, struct RProc *proc, mrb_value self, unsigned int
CASE
(
OP_ERR
)
{
CASE
(
OP_ERR
)
{
/* Bx raise RuntimeError with message Lit(Bx) */
/* Bx raise RuntimeError with message Lit(Bx) */
mrb_value
msg
=
pool
[
GETARG_Bx
(
i
)]
;
mrb_value
msg
=
mrb_str_new
(
mrb
,
pool
[
GETARG_Bx
(
i
)].
value
.
s
->
buf
,
pool
[
GETARG_Bx
(
i
)].
value
.
s
->
len
)
;
mrb_value
exc
;
mrb_value
exc
;
if
(
GETARG_A
(
i
)
==
0
)
{
if
(
GETARG_A
(
i
)
==
0
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment