head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.94
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.92
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.90
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.88
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.86
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.84
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.82
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.80
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.78
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.76
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.74
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.72
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.70
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.68
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.66
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.64
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.62
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.60
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.58
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.56
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.54
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.52
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.50
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.46
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.26
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.48
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.44
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.42
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.40
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.38
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.36
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.34
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.32
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.30
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.28
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.24
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.22
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.20
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.18
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.16
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.14
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.12
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.10
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.8
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.6
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.4
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.2
	pkgsrc-2014Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2014.08.29.04.40.06;	author mef;	state Exp;
branches;
next	;
commitid	aGTdUgd0sDGFfdOx;


desc
@@


1.1
log
@(pkgsrc)
  simulavr asks for libiberty.a.
  With avr-gcc 4.5.3 and avr-binutils-2.23.2, binutils is installing
  libiberty.a
  But with new binutils-2.24, it won't install libiberty. Instead,
  avr-gcc-4.8.3 will provied libiberty.
  Makefile (of simulavr) now has pointer to PATH of libiberty now
  as:
    CONFIGURE_ARGS+=        --with-libiberty=${PREFIX}/lib/gcc/avr
(Add patches)
   patch-src_systemclock_cpp (rename from  patch-src_systemclock.cpp)
   patch-src_systemclock_h
   patch-src_traceval_cpp
   patch-src_traceval_h
     clang flags as resize unresolved reference,
     backport from git repository (as of 2013-09-15).
  patch-examples_atmel_key_StdDefs_c        Status: Locally Added
     passing argument 1 of 'strlen' differ in signedness [-Wpointer-sign]
@
text
@$NetBSD$

clang flags as resize unresolved reference,
backport from git repository (as of 2013-09-15).

--- simulavr-1.0.0/src/systemclock.h	2012-02-13 00:26:38.000000000 +0900
+++ src/systemclock.h	2013-09-13 09:41:15.000000000 +0900
@@@@ -2,7 +2,7 @@@@
  ****************************************************************************
  *
  * simulavr - A simulator for the Atmel AVR family of microcontrollers.
- * Copyright (C) 2001, 2002, 2003   Klaus Rudolph       
+ * Copyright (C) 2001, 2002, 2003 Klaus Rudolph
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@@@ -29,26 +29,41 @@@@
 #include <map>
 #include <vector>
 
-#include "avrdevice.h"
 #include "systemclocktypes.h"
 
+class SimulationMember;
+
 /** A heap data structure optimized for obtaining Value of the smallest Key.
-	Example MinHeap<SystemClockOffset, SimulationMember*>. */
+    Example MinHeap<SystemClockOffset, SimulationMember*>. */
 template<typename Key, typename Value>
 class MinHeap : public std::vector<std::pair<Key,Value> >
 {
 public:
-	MinHeap();
-	bool IsEmpty() const { return this->empty(); }
-	Value GetMinimumKey() const { return this->front().first; }
-	Value GetMinimumValue() const { return this->front().second; };
-	void RemoveMinimum();
-	bool ContainsValue(Value v) const;
-	void Insert(Key k, Value v);
-	void RemoveMinimumAndInsert(Key k, Value v);
+    MinHeap();
+    bool IsEmpty() const { return this->empty(); }
+    Key GetMinimumKey() const { return this->front().first; }
+    Value GetMinimumValue() const { return this->front().second; };
+    void RemoveMinimum();
+    bool ContainsValue(Value v) const;
+    void Insert(Key k, Value v) {
+        this->resize(this->size()+1);
+        InsertInternal(k, v, this->size());
+    }
+    void RemoveMinimumAndInsert(Key k, Value v) {
+        RemoveAtPositionAndInsertInternal(k, v, 0);
+    }
+    void RemoveAtPositionAndInsert(Key k, Value v, unsigned pos) {
+        if(k < (*this)[pos-1].first)
+            InsertInternal(k, v, pos);
+        else
+            RemoveAtPositionAndInsertInternal(k, v, pos);
+    }
+protected:
+    // These are internal because a bad value of `pos' could violate the binary heap invariant.
+    void InsertInternal(Key k, Value v, unsigned pos);
+    void RemoveAtPositionAndInsertInternal(Key k, Value v, unsigned pos);
 };
 
-
 //! Class to store and manage the central simulation time
 /*! This acts as a time table, a simulation member gets a place on this ordered
     table, where it should be called next time, the placement depends on the
@@@@ -72,7 +87,7 @@@@
 
     protected:
         SystemClockOffset currentTime;  //!< time in [ns] since start of simulation
-		MinHeap<SystemClockOffset, SimulationMember *> syncMembers;  //!< earliest first
+        MinHeap<SystemClockOffset, SimulationMember *> syncMembers;  //!< earliest first
         std::vector<SimulationMember*> asyncMembers; //!< List of asynchron working simulation members, will be called every step!
         
     public:
@