further code cleanup from memory system upgrade part 1

Ge Wang committed 3 years ago

Commit 927edfd1 parent beef6542 files · +10 −31Browse files

Showing the changes to src (2 of 2 files). Show all

Unified · Split

2 files

src/core/chuck_emit.cpp +8 −14
src/core/chuck_instr.cpp +2 −17

 t_CKBOOL emit_engine_emit_exp_dur( Chuck_Emitter * emit, a_Exp_Dur dur );
 t_CKBOOL emit_engine_emit_exp_array( Chuck_Emitter * emit, a_Exp_Array array );
 t_CKBOOL emit_engine_emit_exp_func_call( Chuck_Emitter * emit, Chuck_Func * func,
-                                         a_Exp args, Chuck_Type * type, int linepos, t_CKBOOL spork = FALSE );
+                                         Chuck_Type * type, int linepos, t_CKBOOL spork = FALSE );
 t_CKBOOL emit_engine_emit_exp_func_call( Chuck_Emitter * emit, a_Exp_Func_Call func_call,
                                          t_CKBOOL spork = FALSE );
 t_CKBOOL emit_engine_emit_func_args( Chuck_Emitter * emit, a_Exp_Func_Call func_call );
         assert( binary->ck_func != NULL );
         // emit
-        return emit_engine_emit_exp_func_call( emit, binary->ck_func, binary->lhs, binary->self->type, binary->linepos );
+        return emit_engine_emit_exp_func_call( emit, binary->ck_func, binary->self->type, binary->linepos );
     }
     // assignment or something else
 //-----------------------------------------------------------------------------
 t_CKBOOL emit_engine_emit_exp_func_call( Chuck_Emitter * emit,
                                          Chuck_Func * func,
-                                         a_Exp args,
                                          Chuck_Type * type,
                                          int linepos,
                                          t_CKBOOL spork )
     }
     // the rest
-    return emit_engine_emit_exp_func_call( emit, func_call->ck_func, func_call->args,
+    return emit_engine_emit_exp_func_call( emit, func_call->ck_func,
                                            func_call->ret_type, func_call->linepos, spork );
 }
     // call the func on sporkee shred
     if( !emit_engine_emit_exp_func_call( emit,
                                          exp->ck_func,
-                                         exp->args,
                                          exp->ret_type,
                                          exp->linepos,
                                          TRUE ) ) return FALSE;
         // skip scope boundary (denoted by NULL)
         if( !local ) continue;
-        // CK_STDCERR << "local: " << local->offset << " " << local->is_obj << CK_STDENDL;
+        // check to see if it's an object (but not global)
-        // check to see if it's an object
+        // (REFACTOR-2017: don't release global objects)
-        if( local->is_obj )
+        if( local->is_obj && !local->is_global )
         {
-            // (REFACTOR-2017: don't release global objects)
+            // emit instruction to release the object
-            if( !local->is_global )
+            this->append( new Chuck_Instr_Release_Object2( local->offset ) );
-            {
-                // emit instruction to release the object
-                this->append( new Chuck_Instr_Release_Object2( local->offset ) );
-            }
         }
     }

src/core/chuck_instr.cpp+2−17

         // 1.4.2.1 (ge) | added -- ensure ref count
         if( m_func_ref && isobj(vm->env(), m_func_ref->def->ret_type) )
         {
+            // get return value as object reference
             Chuck_VM_Object * obj = (Chuck_VM_Object *) retval.v_uint;
             if( obj )
             {
-                // check if refcount is 0
-                if( obj->m_ref_count == 0 )
-                {
-                    EM_log( CK_LOG_FINE, "%s(...) returned object with refcount==0", S_name(m_func_ref->def->name) );
-                    EM_pushlog();
-                    EM_log( CK_LOG_FINE, "auto-incrementing object refcount to 1..." );
-                    EM_poplog();
-                }
                 // always add reference to returned objects (should release outside)
                 obj->add_ref();
             }
         // 1.4.2.1 (ge) | added -- ensure ref count
         if( m_func_ref && isobj(vm->env(), m_func_ref->def->ret_type) )
         {
-            // get as object pointer
+            // get return value as object reference
             Chuck_VM_Object * obj = (Chuck_VM_Object *) retval.v_uint;
             if( obj )
             {
-                // check if refcount is 0
-                if( obj->m_ref_count == 0 )
-                {
-                    EM_log( CK_LOG_FINE, "%s(...) returned object with refcount==0", S_name(m_func_ref->def->name) );
-                    EM_pushlog();
-                    EM_log( CK_LOG_FINE, "auto-incrementing object refcount to 1..." );
-                    EM_poplog();
-                }
                 // always add reference to returned objects (should release outside)
                 obj->add_ref();
             }

further code cleanup from memory system upgrade part 1

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code