aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
index c68b7c189..47a6cab1d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
@@ -4,7 +4,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import java.io.Serializable;
-import java.util.HashMap;
+import java.util.ArrayList;
/** This class is a a transferable representation for a collection of changes
* to be done on a keyring.
@@ -29,14 +29,14 @@ public class SaveKeyringParcel implements Parcelable {
public String newPassphrase;
- public String[] addUserIds;
- public SubkeyAdd[] addSubKeys;
+ public ArrayList<String> addUserIds;
+ public ArrayList<SubkeyAdd> addSubKeys;
- public SubkeyChange[] changeSubKeys;
+ public ArrayList<SubkeyChange> changeSubKeys;
public String changePrimaryUserId;
- public String[] revokeUserIds;
- public long[] revokeSubKeys;
+ public ArrayList<String> revokeUserIds;
+ public ArrayList<Long> revokeSubKeys;
public SaveKeyringParcel(long masterKeyId, byte[] fingerprint) {
mMasterKeyId = masterKeyId;
@@ -73,14 +73,14 @@ public class SaveKeyringParcel implements Parcelable {
mMasterKeyId = source.readLong();
mFingerprint = source.createByteArray();
- addUserIds = source.createStringArray();
- addSubKeys = (SubkeyAdd[]) source.readSerializable();
+ addUserIds = source.createStringArrayList();
+ addSubKeys = (ArrayList<SubkeyAdd>) source.readSerializable();
- changeSubKeys = (SubkeyChange[]) source.readSerializable();
+ changeSubKeys = (ArrayList<SubkeyChange>) source.readSerializable();
changePrimaryUserId = source.readString();
- revokeUserIds = source.createStringArray();
- revokeSubKeys = source.createLongArray();
+ revokeUserIds = source.createStringArrayList();
+ revokeSubKeys = (ArrayList<Long>) source.readSerializable();
}
@Override
@@ -88,14 +88,14 @@ public class SaveKeyringParcel implements Parcelable {
destination.writeLong(mMasterKeyId);
destination.writeByteArray(mFingerprint);
- destination.writeStringArray(addUserIds);
+ destination.writeStringList(addUserIds);
destination.writeSerializable(addSubKeys);
destination.writeSerializable(changeSubKeys);
destination.writeString(changePrimaryUserId);
- destination.writeStringArray(revokeUserIds);
- destination.writeLongArray(revokeSubKeys);
+ destination.writeStringList(revokeUserIds);
+ destination.writeSerializable(revokeSubKeys);
}
public static final Creator<SaveKeyringParcel> CREATOR = new Creator<SaveKeyringParcel>() {
.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
/*
 *  yosys -- Yosys Open SYnthesis Suite
 *
 *  Copyright (C) 2012  Clifford Wolf <clifford@clifford.at>
 *
 *  Permission to use, copy, modify, and/or distribute this software for any
 *  purpose with or without fee is hereby granted, provided that the above
 *  copyright notice and this permission notice appear in all copies.
 *
 *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 *
 */

#ifndef COST_H
#define COST_H

#include "kernel/yosys.h"

YOSYS_NAMESPACE_BEGIN

int get_cell_cost(RTLIL::Cell *cell, dict<RTLIL::IdString, int> *mod_cost_cache = nullptr);

inline int get_cell_cost(RTLIL::IdString type, const dict<RTLIL::IdString, RTLIL::Const> &parameters = dict<RTLIL::IdString, RTLIL::Const>(),
		RTLIL::Design *design = nullptr, dict<RTLIL::IdString, int> *mod_cost_cache = nullptr)
{
	static dict<RTLIL::IdString, int> gate_cost = {
		{ "$_BUF_",    1 },
		{ "$_NOT_",    2 },
		{ "$_AND_",    4 },
		{ "$_NAND_",   4 },
		{ "$_OR_",     4 },
		{ "$_NOR_",    4 },
		{ "$_ANDNOT_", 4 },
		{ "$_ORNOT_",  4 },
		{ "$_XOR_",    8 },
		{ "$_XNOR_",   8 },
		{ "$_AOI3_",   6 },
		{ "$_OAI3_",   6 },
		{ "$_AOI4_",   8 },
		{ "$_OAI4_",   8 },
		{ "$_MUX_",    4 }
	};

	if (gate_cost.count(type))
		return gate_cost.at(type);

	if (parameters.empty() && design && design->module(type))
	{
		RTLIL::Module *mod = design->module(type);

		if (mod->attributes.count("\\cost"))
			return mod->attributes.at("\\cost").as_int();

		dict<RTLIL::IdString, int> local_mod_cost_cache;
		if (mod_cost_cache == nullptr)
			mod_cost_cache = &local_mod_cost_cache;

		if (mod_cost_cache->count(mod->name))
			return mod_cost_cache->at(mod->name);

		int module_cost = 1;
		for (auto c : mod->cells())
			module_cost += get_cell_cost(c, mod_cost_cache);

		(*mod_cost_cache)[mod->name] = module_cost;
		return module_cost;
	}

	log_warning("Can't determine cost of %s cell (%d parameters).\n", log_id(type), GetSize(parameters));
	return 1;
}

inline int get_cell_cost(RTLIL::Cell *cell, dict<RTLIL::IdString, int> *mod_cost_cache)
{
	return get_cell_cost(cell->type, cell->parameters, cell->module->design, mod_cost_cache);
}

YOSYS_NAMESPACE_END

#endif