Attachment #113539 for bug #171206

View | Details | Raw Unified | Return to bug 171206
Collapse All | Expand All

Lines 227-232 Link Here

(-)../systemc-2.1.v1/src/sysc/datatypes/fx/sc_context.h (+1 lines)
227	{	227	{
228	// this method should never be called	228	// this method should never be called
229	SC_REPORT_FATAL( sc_core::SC_ID_INTERNAL_ERROR_, "should never be called" );	229	SC_REPORT_FATAL( sc_core::SC_ID_INTERNAL_ERROR_, "should never be called" );
		230	return NULL;
230	}	231	}
231		232
232		233




};


void multiply( scfx_rep&, const scfx_rep&, const scfx_rep&,
	       int = SC_DEFAULT_MAX_WL_ );

scfx_rep*  neg_scfx_rep( const scfx_rep& );
scfx_rep* mult_scfx_rep( const scfx_rep&, const scfx_rep&,
			 int = SC_DEFAULT_MAX_WL_ );
scfx_rep*  div_scfx_rep( const scfx_rep&, const scfx_rep&,
			 int = SC_DEFAULT_DIV_WL_ );
scfx_rep*  add_scfx_rep( const scfx_rep&, const scfx_rep&,
			 int = SC_DEFAULT_MAX_WL_ );
scfx_rep*  sub_scfx_rep( const scfx_rep&, const scfx_rep&,
			 int = SC_DEFAULT_MAX_WL_ );
scfx_rep*  lsh_scfx_rep( const scfx_rep&, int );
scfx_rep*  rsh_scfx_rep( const scfx_rep&, int );

int        cmp_scfx_rep( const scfx_rep&, const scfx_rep& );

// ----------------------------------------------------------------------------
//  CLASS : scfx_rep
//


    void operator = ( const scfx_rep& );

    friend void multiply( scfx_rep&, const scfx_rep&, const scfx_rep&, int);
			  int = SC_DEFAULT_MAX_WL_ );

    friend scfx_rep*  neg_scfx_rep( const scfx_rep& );
    friend scfx_rep* mult_scfx_rep( const scfx_rep&, const scfx_rep&, int);
    friend scfx_rep*  div_scfx_rep( const scfx_rep&, const scfx_rep&, int);
    friend scfx_rep*  add_scfx_rep( const scfx_rep&, const scfx_rep&, int);
    friend scfx_rep*  sub_scfx_rep( const scfx_rep&, const scfx_rep&, int);
    friend scfx_rep*  add_scfx_rep( const scfx_rep&, const scfx_rep&,
				     int = SC_DEFAULT_MAX_WL_ );
    friend scfx_rep*  sub_scfx_rep( const scfx_rep&, const scfx_rep&,
				     int = SC_DEFAULT_MAX_WL_ );
    friend scfx_rep*  lsh_scfx_rep( const scfx_rep&, int );
    friend scfx_rep*  rsh_scfx_rep( const scfx_rep&, int );





::std::istream&
operator >> ( ::std::istream&, sc_signed_subref& );

// Helper functions forward declarations
sc_signed add_signed_friend(small_type us, 
			    int unb,
			    int und, 
			    const unsigned long *ud, 
			    small_type vs, 
			    int vnb,
			    int vnd,
			    const unsigned long *vd);

sc_signed sub_signed_friend(small_type us, 
			    int unb,
			    int und, 
			    const unsigned long *ud, 
			    small_type vs, 
			    int vnb,
			    int vnd, 
			    const unsigned long *vd);
  
sc_signed mul_signed_friend(small_type s,
			    int unb,
			    int und, 
			    const unsigned long *ud, 
			    int vnb,
			    int vnd,
			    const unsigned long *vd);

sc_signed div_signed_friend(small_type s,
			    int unb,
			    int und, 
			    const unsigned long *ud, 
			    int vnb,
			    int vnd,
			    const unsigned long *vd);

sc_signed mod_signed_friend(small_type us,
			    int unb,
			    int und, 
			    const unsigned long *ud, 
			    int vnb,
			    int vnd,
			    const unsigned long *vd);
  
sc_signed and_signed_friend(small_type us, 
			    int unb, 
			    int und, 
			    const unsigned long *ud, 
			    small_type vs,
			    int vnb, 
			    int vnd,
			    const unsigned long *vd);
  
sc_signed or_signed_friend(small_type us, 
			   int unb, 
			   int und, 
			   const unsigned long *ud, 
			   small_type vs,
			   int vnb, 
			   int vnd,
			   const unsigned long *vd);
  
sc_signed xor_signed_friend(small_type us, 
			    int unb, 
			    int und, 
			    const unsigned long *ud, 
			    small_type vs,
			    int vnb, 
			    int vnd,
			    const unsigned long *vd);


// ----------------------------------------------------------------------------
//  CLASS : sc_signed




operator >> ( ::std::istream&, sc_unsigned_subref& );


// Helper functions forward declarations
int compare_unsigned(small_type us, 
		     int unb,
		     int und, 
		     const unsigned long *ud, 
		     small_type vs, 
		     int vnb,
		     int vnd,
		     const unsigned long *vd,
		     small_type if_u_signed = 0,
		     small_type if_v_signed = 0);
  
sc_unsigned add_unsigned_friend(small_type us, 
				int unb,
				int und, 
				const unsigned long *ud, 
				small_type vs, 
				int vnb,
				int vnd,
				const unsigned long *vd);
  
sc_unsigned sub_unsigned_friend(small_type us, 
				int unb,
				int und, 
				const unsigned long *ud, 
				small_type vs, 
				int vnb,
				int vnd, 
				const unsigned long *vd);
  
sc_unsigned mul_unsigned_friend(small_type s,
				int unb,
				int und, 
				const unsigned long *ud, 
				int vnb,
				int vnd,
				const unsigned long *vd);
  
sc_unsigned div_unsigned_friend(small_type s,
				int unb,
				int und, 
				const unsigned long *ud, 
				int vnb,
				int vnd,
				const unsigned long *vd);
  
sc_unsigned mod_unsigned_friend(small_type us,
				int unb,
				int und, 
				const unsigned long *ud, 
				int vnb,
				int vnd,
				const unsigned long *vd);
  
sc_unsigned and_unsigned_friend(small_type us, 
				int unb, 
				int und, 
				const unsigned long *ud, 
				small_type vs,
				int vnb, 
				int vnd,
				const unsigned long *vd);
  
sc_unsigned or_unsigned_friend(small_type us, 
			       int unb, 
			       int und, 
			       const unsigned long *ud, 
			       small_type vs,
			       int vnb, 
			       int vnd,
			       const unsigned long *vd);

sc_unsigned xor_unsigned_friend(small_type us, 
				int unb, 
				int und, 
				const unsigned long *ud, 
				small_type vs,
				int vnb, 
				int vnd,
				const unsigned long *vd);

// ----------------------------------------------------------------------------
//  CLASS : sc_unsigned
//

                              int vnb,
                              int vnd,
                              const unsigned long *vd,
                              small_type if_u_signed,
                              small_type if_v_signed);
  
  friend sc_unsigned add_unsigned_friend(small_type us, 
                                         int unb,

Lines 57-62 Link Here

(-)../systemc-2.1.v1/src/sysc/datatypes/misc/sc_value_base.h (+2 lines)
57	class sc_value_base	57	class sc_value_base
58	{	58	{
59	friend class sc_concatref;	59	friend class sc_concatref;
		60	public:
		61	virtual ~sc_value_base() {}
60	private:	62	private:
61	virtual void concat_clear_data( bool to_ones=false );	63	virtual void concat_clear_data( bool to_ones=false );
62	virtual bool concat_get_ctrl( unsigned long* dst_p, int low_i ) const;	64	virtual bool concat_get_ctrl( unsigned long* dst_p, int low_i ) const;

Lines 73-78 Link Here

(-)../systemc-2.1.v1/src/sysc/kernel/sc_process_host.h (+2 lines)
73	spm_exit = 0	73	spm_exit = 0
74	};	74	};
75	virtual void signal(sc_thread_handle thread_p, int type);	75	virtual void signal(sc_thread_handle thread_p, int type);
		76
		77	virtual ~sc_process_monitor() {}
76	};	78	};
77		79
78	// -----------------------------------------------------------------------------	80	// -----------------------------------------------------------------------------

Lines 290-295 Link Here

(-)../systemc-2.1.v1/src/sysc/kernel/sc_process_int.h (+3 lines)
290	// Process class for SC_THREADs.	290	// Process class for SC_THREADs.
291	// ----------------------------------------------------------------------------	291	// ----------------------------------------------------------------------------
292		292
		293	void sc_thread_cor_fn( void* );
		294	void sc_cthread_cor_fn( void* );
		295
293	class sc_thread_process	296	class sc_thread_process
294	: public sc_process_b	297	: public sc_process_b
295	{	298	{

Return to bug 171206

Lines 471-476 Link Here

(-)../systemc-2.1.v1/src/sysc/datatypes/int/sc_signed.h (+70 lines)
471	::std::istream&	471	::std::istream&
472	operator >> ( ::std::istream&, sc_signed_subref& );	472	operator >> ( ::std::istream&, sc_signed_subref& );
473		473
		474	// Helper functions forward declarations
		475	sc_signed add_signed_friend(small_type us,
		476	int unb,
		477	int und,
		478	const unsigned long *ud,
		479	small_type vs,
		480	int vnb,
		481	int vnd,
		482	const unsigned long *vd);
		483
		484	sc_signed sub_signed_friend(small_type us,
		485	int unb,
		486	int und,
		487	const unsigned long *ud,
		488	small_type vs,
		489	int vnb,
		490	int vnd,
		491	const unsigned long *vd);
		492
		493	sc_signed mul_signed_friend(small_type s,
		494	int unb,
		495	int und,
		496	const unsigned long *ud,
		497	int vnb,
		498	int vnd,
		499	const unsigned long *vd);
		500
		501	sc_signed div_signed_friend(small_type s,
		502	int unb,
		503	int und,
		504	const unsigned long *ud,
		505	int vnb,
		506	int vnd,
		507	const unsigned long *vd);
		508
		509	sc_signed mod_signed_friend(small_type us,
		510	int unb,
		511	int und,
		512	const unsigned long *ud,
		513	int vnb,
		514	int vnd,
		515	const unsigned long *vd);
		516
		517	sc_signed and_signed_friend(small_type us,
		518	int unb,
		519	int und,
		520	const unsigned long *ud,
		521	small_type vs,
		522	int vnb,
		523	int vnd,
		524	const unsigned long *vd);
		525
		526	sc_signed or_signed_friend(small_type us,
		527	int unb,
		528	int und,
		529	const unsigned long *ud,
		530	small_type vs,
		531	int vnb,
		532	int vnd,
		533	const unsigned long *vd);
		534
		535	sc_signed xor_signed_friend(small_type us,
		536	int unb,
		537	int und,
538	const unsigned long *ud,
539	small_type vs,
540	int vnb,
541	int vnd,
542	const unsigned long *vd);
543
474		544
475	// ----------------------------------------------------------------------------	545	// ----------------------------------------------------------------------------
476	// CLASS : sc_signed	546	// CLASS : sc_signed

Lines 470-475 Link Here

(-)../systemc-2.1.v1/src/sysc/datatypes/int/sc_unsigned.h (-2 / +83 lines)
470	operator >> ( ::std::istream&, sc_unsigned_subref& );	470	operator >> ( ::std::istream&, sc_unsigned_subref& );
471		471
472		472
		473	// Helper functions forward declarations
		474	int compare_unsigned(small_type us,
		475	int unb,
		476	int und,
		477	const unsigned long *ud,
		478	small_type vs,
		479	int vnb,
		480	int vnd,
		481	const unsigned long *vd,
		482	small_type if_u_signed = 0,
		483	small_type if_v_signed = 0);
		484
		485	sc_unsigned add_unsigned_friend(small_type us,
		486	int unb,
		487	int und,
		488	const unsigned long *ud,
		489	small_type vs,
		490	int vnb,
		491	int vnd,
		492	const unsigned long *vd);
		493
		494	sc_unsigned sub_unsigned_friend(small_type us,
		495	int unb,
		496	int und,
		497	const unsigned long *ud,
		498	small_type vs,
		499	int vnb,
		500	int vnd,
		501	const unsigned long *vd);
		502
		503	sc_unsigned mul_unsigned_friend(small_type s,
		504	int unb,
		505	int und,
		506	const unsigned long *ud,
		507	int vnb,
		508	int vnd,
		509	const unsigned long *vd);
		510
		511	sc_unsigned div_unsigned_friend(small_type s,
		512	int unb,
		513	int und,
		514	const unsigned long *ud,
		515	int vnb,
		516	int vnd,
		517	const unsigned long *vd);
		518
		519	sc_unsigned mod_unsigned_friend(small_type us,
		520	int unb,
		521	int und,
		522	const unsigned long *ud,
		523	int vnb,
		524	int vnd,
		525	const unsigned long *vd);
		526
		527	sc_unsigned and_unsigned_friend(small_type us,
		528	int unb,
		529	int und,
		530	const unsigned long *ud,
		531	small_type vs,
		532	int vnb,
		533	int vnd,
		534	const unsigned long *vd);
		535
		536	sc_unsigned or_unsigned_friend(small_type us,
537	int unb,
538	int und,
539	const unsigned long *ud,
540	small_type vs,
541	int vnb,
542	int vnd,
543	const unsigned long *vd);
544
545	sc_unsigned xor_unsigned_friend(small_type us,
546	int unb,
547	int und,
548	const unsigned long *ud,
549	small_type vs,
550	int vnb,
551	int vnd,
552	const unsigned long *vd);
553
473	// ----------------------------------------------------------------------------	554	// ----------------------------------------------------------------------------
474	// CLASS : sc_unsigned	555	// CLASS : sc_unsigned
475	//	556	//
Lines 1364-1371 Link Here
1364	int vnb,	1445	int vnb,
1365	int vnd,	1446	int vnd,
1366	const unsigned long *vd,	1447	const unsigned long *vd,
1367	small_type if_u_signed = 0,	1448	small_type if_u_signed,
1368	small_type if_v_signed = 0);	1449	small_type if_v_signed);
1369		1450
1370	friend sc_unsigned add_unsigned_friend(small_type us,	1451	friend sc_unsigned add_unsigned_friend(small_type us,
1371	int unb,	1452	int unb,

Lines 88-93 Link Here

(-)../systemc-2.1.v1/src/sysc/datatypes/fx/scfx_rep.h (-10 / +22 lines)
88	};	88	};
89		89
90		90
		91	void multiply( scfx_rep&, const scfx_rep&, const scfx_rep&,
		92	int = SC_DEFAULT_MAX_WL_ );
		93
		94	scfx_rep* neg_scfx_rep( const scfx_rep& );
		95	scfx_rep* mult_scfx_rep( const scfx_rep&, const scfx_rep&,
		96	int = SC_DEFAULT_MAX_WL_ );
		97	scfx_rep* div_scfx_rep( const scfx_rep&, const scfx_rep&,
		98	int = SC_DEFAULT_DIV_WL_ );
		99	scfx_rep* add_scfx_rep( const scfx_rep&, const scfx_rep&,
		100	int = SC_DEFAULT_MAX_WL_ );
		101	scfx_rep* sub_scfx_rep( const scfx_rep&, const scfx_rep&,
		102	int = SC_DEFAULT_MAX_WL_ );
		103	scfx_rep* lsh_scfx_rep( const scfx_rep&, int );
		104	scfx_rep* rsh_scfx_rep( const scfx_rep&, int );
		105
		106	int cmp_scfx_rep( const scfx_rep&, const scfx_rep& );
		107
91	// ----------------------------------------------------------------------------	108	// ----------------------------------------------------------------------------
92	// CLASS : scfx_rep	109	// CLASS : scfx_rep
93	//	110	//
Lines 148-165 Link Here
148		165
149	void operator = ( const scfx_rep& );	166	void operator = ( const scfx_rep& );
150		167
151	friend void multiply( scfx_rep&, const scfx_rep&, const scfx_rep&,	168	friend void multiply( scfx_rep&, const scfx_rep&, const scfx_rep&, int);
152	int = SC_DEFAULT_MAX_WL_ );
153		169
154	friend scfx_rep* neg_scfx_rep( const scfx_rep& );	170	friend scfx_rep* neg_scfx_rep( const scfx_rep& );
155	friend scfx_rep* mult_scfx_rep( const scfx_rep&, const scfx_rep&,	171	friend scfx_rep* mult_scfx_rep( const scfx_rep&, const scfx_rep&, int);
156	int = SC_DEFAULT_MAX_WL_ );	172	friend scfx_rep* div_scfx_rep( const scfx_rep&, const scfx_rep&, int);
157	friend scfx_rep* div_scfx_rep( const scfx_rep&, const scfx_rep&,	173	friend scfx_rep* add_scfx_rep( const scfx_rep&, const scfx_rep&, int);
158	int = SC_DEFAULT_DIV_WL_ );	174	friend scfx_rep* sub_scfx_rep( const scfx_rep&, const scfx_rep&, int);
159	friend scfx_rep* add_scfx_rep( const scfx_rep&, const scfx_rep&,
160	int = SC_DEFAULT_MAX_WL_ );
161	friend scfx_rep* sub_scfx_rep( const scfx_rep&, const scfx_rep&,
162	int = SC_DEFAULT_MAX_WL_ );
163	friend scfx_rep* lsh_scfx_rep( const scfx_rep&, int );	175	friend scfx_rep* lsh_scfx_rep( const scfx_rep&, int );
164	friend scfx_rep* rsh_scfx_rep( const scfx_rep&, int );	176	friend scfx_rep* rsh_scfx_rep( const scfx_rep&, int );
165		177